ref: 61847b3596807fd5789c800139af624bcac32e7a
parent: e0d07fba3fbc5e5923d3f523afe386ad3fab1393
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Jun 22 12:30:13 EDT 2020
Identify some more labels
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1241,7 +1241,7 @@
GetStatExpRelativePointer:
ld a, [wCurItem]
- ld hl, Table_eeeb
+ ld hl, StatExpItemPointerOffsets
.next
cp [hl]
inc hl
@@ -1255,7 +1255,7 @@
ld b, 0
ret
-Table_eeeb:
+StatExpItemPointerOffsets:
db HP_UP, MON_HP_EXP - MON_STAT_EXP
db PROTEIN, MON_ATK_EXP - MON_STAT_EXP
db IRON, MON_DEF_EXP - MON_STAT_EXP
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -961,7 +961,7 @@
Script_appear:
call GetScriptByte
call GetScriptObject
- call _CopyObjectStruct
+ call UnmaskCopyMapObjectStruct
ldh a, [hMapObjectIndexBuffer]
ld b, 0 ; clear
call ApplyEventActionAppearDisappear
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -467,9 +467,8 @@
call GetMapMusic
ret
-Function3d9f:: ; unreferenced
-; Places a BCD number at the
-; upper center of the screen.
+PlaceBCDNumberSprite:: ; unreferenced
+; Places a BCD number at the upper center of the screen.
ld a, 4 * TILE_WIDTH
ld [wVirtualOAMSprite38YCoord], a
ld [wVirtualOAMSprite39YCoord], a
--- a/home/map.asm
+++ b/home/map.asm
@@ -1312,7 +1312,7 @@
ldh [hBGMapTileCount], a
ret
-Function2816:: ; unreferenced
+ClearBGMapBuffer:: ; unreferenced
ld hl, wBGMapBuffer
ld bc, wBGMapBufferEnd - wBGMapBuffer
xor a
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -300,13 +300,13 @@
scf
ret
-; unused
+CopyMapObjectStruct:: ; unreferenced
ldh [hMapObjectIndexBuffer], a
call GetMapObject
call CopyObjectStruct
ret
-_CopyObjectStruct::
+UnmaskCopyMapObjectStruct::
ldh [hMapObjectIndexBuffer], a
call UnmaskObject
ldh a, [hMapObjectIndexBuffer]
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -720,7 +720,7 @@
call PlaceString
ret
-Function1f9e:: ; unreferenced
+GetNthMenuStrings:: ; unreferenced
call GetMenuDataPointerTableEntry
inc hl
inc hl
--- a/hram.asm
+++ b/hram.asm
@@ -31,8 +31,8 @@
hROMBank:: db
hVBlank:: db
hMapEntryMethod:: db
-hMenuReturn:: db
+hMenuReturn:: db
hUnusedFFA1:: db
hJoypadReleased:: db
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -25,13 +25,13 @@
FirstStepIntoKantoLeftScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
- applymovement ROUTE27_FISHER, MovementData_0x1a0a66
+ applymovement ROUTE27_FISHER, Route27FisherStepLeftTwiceMovement
sjump FirstStepIntoKantoScene_Continue
FirstStepIntoKantoRightScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
- applymovement ROUTE27_FISHER, MovementData_0x1a0a69
+ applymovement ROUTE27_FISHER, Route27FisherStepLeftOnceMovement
FirstStepIntoKantoScene_Continue:
turnobject PLAYER, RIGHT
opentext
@@ -305,12 +305,12 @@
Route27RareCandy:
itemball RARE_CANDY
-MovementData_0x1a0a66:
+Route27FisherStepLeftTwiceMovement:
step LEFT
step LEFT
step_end
-MovementData_0x1a0a69:
+Route27FisherStepLeftOnceMovement:
step LEFT
step_end
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -60,10 +60,10 @@
closetext
playmusic MUSIC_SHOW_ME_AROUND
follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER
- applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba
+ applymovement RUINSOFALPHOUTSIDE_SCIENTIST, RuinsOfAlphOutsideScientistWalkToLabMovement
disappear RUINSOFALPHOUTSIDE_SCIENTIST
stopfollow
- applymovement PLAYER, MovementData_0x580c5
+ applymovement PLAYER, RuinsOfAlphOutsidePlayerEnterLabMovement
setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
warpcheck
end
@@ -130,7 +130,7 @@
RuinsOfAlphResearchCenterSign:
jumptext RuinsOfAlphResearchCenterSignText
-MovementData_0x580ba:
+RuinsOfAlphOutsideScientistWalkToLabMovement:
step RIGHT
step RIGHT
step RIGHT
@@ -143,7 +143,7 @@
step UP
step_end
-MovementData_0x580c5:
+RuinsOfAlphOutsidePlayerEnterLabMovement:
step UP
step_end
--- a/sram.asm
+++ b/sram.asm
@@ -59,7 +59,7 @@
ds 1
sMysteryGiftTrainerHouseFlag:: db
sMysteryGiftPartnerName:: ds NAME_LENGTH
-s0_ac09:: ds 1
+ ds 1
sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
sBackupMysteryGiftItemEnd::