Identify some more labels

This commit is contained in:
Rangi 2020-06-22 16:30:13 -04:00
parent e0d07fba3f
commit 61847b3596
10 changed files with 19 additions and 20 deletions

View File

@ -1241,7 +1241,7 @@ StatStrings:
GetStatExpRelativePointer: GetStatExpRelativePointer:
ld a, [wCurItem] ld a, [wCurItem]
ld hl, Table_eeeb ld hl, StatExpItemPointerOffsets
.next .next
cp [hl] cp [hl]
inc hl inc hl
@ -1255,7 +1255,7 @@ GetStatExpRelativePointer:
ld b, 0 ld b, 0
ret ret
Table_eeeb: StatExpItemPointerOffsets:
db HP_UP, MON_HP_EXP - MON_STAT_EXP db HP_UP, MON_HP_EXP - MON_STAT_EXP
db PROTEIN, MON_ATK_EXP - MON_STAT_EXP db PROTEIN, MON_ATK_EXP - MON_STAT_EXP
db IRON, MON_DEF_EXP - MON_STAT_EXP db IRON, MON_DEF_EXP - MON_STAT_EXP

View File

@ -961,7 +961,7 @@ Script_variablesprite:
Script_appear: Script_appear:
call GetScriptByte call GetScriptByte
call GetScriptObject call GetScriptObject
call _CopyObjectStruct call UnmaskCopyMapObjectStruct
ldh a, [hMapObjectIndexBuffer] ldh a, [hMapObjectIndexBuffer]
ld b, 0 ; clear ld b, 0 ; clear
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear

View File

@ -467,9 +467,8 @@ GetMapMusic_MaybeSpecial::
call GetMapMusic call GetMapMusic
ret ret
Function3d9f:: ; unreferenced PlaceBCDNumberSprite:: ; unreferenced
; Places a BCD number at the ; Places a BCD number at the upper center of the screen.
; upper center of the screen.
ld a, 4 * TILE_WIDTH ld a, 4 * TILE_WIDTH
ld [wVirtualOAMSprite38YCoord], a ld [wVirtualOAMSprite38YCoord], a
ld [wVirtualOAMSprite39YCoord], a ld [wVirtualOAMSprite39YCoord], a

View File

@ -1312,7 +1312,7 @@ UpdateBGMapColumn::
ldh [hBGMapTileCount], a ldh [hBGMapTileCount], a
ret ret
Function2816:: ; unreferenced ClearBGMapBuffer:: ; unreferenced
ld hl, wBGMapBuffer ld hl, wBGMapBuffer
ld bc, wBGMapBufferEnd - wBGMapBuffer ld bc, wBGMapBufferEnd - wBGMapBuffer
xor a xor a

View File

@ -300,13 +300,13 @@ CheckObjectTime::
scf scf
ret ret
; unused CopyMapObjectStruct:: ; unreferenced
ldh [hMapObjectIndexBuffer], a ldh [hMapObjectIndexBuffer], a
call GetMapObject call GetMapObject
call CopyObjectStruct call CopyObjectStruct
ret ret
_CopyObjectStruct:: UnmaskCopyMapObjectStruct::
ldh [hMapObjectIndexBuffer], a ldh [hMapObjectIndexBuffer], a
call UnmaskObject call UnmaskObject
ldh a, [hMapObjectIndexBuffer] ldh a, [hMapObjectIndexBuffer]

View File

@ -720,7 +720,7 @@ PlaceNthMenuStrings::
call PlaceString call PlaceString
ret ret
Function1f9e:: ; unreferenced GetNthMenuStrings:: ; unreferenced
call GetMenuDataPointerTableEntry call GetMenuDataPointerTableEntry
inc hl inc hl
inc hl inc hl

View File

@ -31,8 +31,8 @@ hVBlankCounter:: db
hROMBank:: db hROMBank:: db
hVBlank:: db hVBlank:: db
hMapEntryMethod:: db hMapEntryMethod:: db
hMenuReturn:: db
hMenuReturn:: db
hUnusedFFA1:: db hUnusedFFA1:: db
hJoypadReleased:: db hJoypadReleased:: db

View File

@ -25,13 +25,13 @@ Route27_MapScripts:
FirstStepIntoKantoLeftScene: FirstStepIntoKantoLeftScene:
turnobject ROUTE27_FISHER, LEFT turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a66 applymovement ROUTE27_FISHER, Route27FisherStepLeftTwiceMovement
sjump FirstStepIntoKantoScene_Continue sjump FirstStepIntoKantoScene_Continue
FirstStepIntoKantoRightScene: FirstStepIntoKantoRightScene:
turnobject ROUTE27_FISHER, LEFT turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a69 applymovement ROUTE27_FISHER, Route27FisherStepLeftOnceMovement
FirstStepIntoKantoScene_Continue: FirstStepIntoKantoScene_Continue:
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
opentext opentext
@ -305,12 +305,12 @@ Route27TMSolarbeam:
Route27RareCandy: Route27RareCandy:
itemball RARE_CANDY itemball RARE_CANDY
MovementData_0x1a0a66: Route27FisherStepLeftTwiceMovement:
step LEFT step LEFT
step LEFT step LEFT
step_end step_end
MovementData_0x1a0a69: Route27FisherStepLeftOnceMovement:
step LEFT step LEFT
step_end step_end

View File

@ -60,10 +60,10 @@ RuinsOfAlphOutsideScientistSceneContinue:
closetext closetext
playmusic MUSIC_SHOW_ME_AROUND playmusic MUSIC_SHOW_ME_AROUND
follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER
applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba applymovement RUINSOFALPHOUTSIDE_SCIENTIST, RuinsOfAlphOutsideScientistWalkToLabMovement
disappear RUINSOFALPHOUTSIDE_SCIENTIST disappear RUINSOFALPHOUTSIDE_SCIENTIST
stopfollow stopfollow
applymovement PLAYER, MovementData_0x580c5 applymovement PLAYER, RuinsOfAlphOutsidePlayerEnterLabMovement
setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
warpcheck warpcheck
end end
@ -130,7 +130,7 @@ RuinsOfAlphSign:
RuinsOfAlphResearchCenterSign: RuinsOfAlphResearchCenterSign:
jumptext RuinsOfAlphResearchCenterSignText jumptext RuinsOfAlphResearchCenterSignText
MovementData_0x580ba: RuinsOfAlphOutsideScientistWalkToLabMovement:
step RIGHT step RIGHT
step RIGHT step RIGHT
step RIGHT step RIGHT
@ -143,7 +143,7 @@ MovementData_0x580ba:
step UP step UP
step_end step_end
MovementData_0x580c5: RuinsOfAlphOutsidePlayerEnterLabMovement:
step UP step UP
step_end step_end

View File

@ -59,7 +59,7 @@ sMysteryGiftTimerStartDay:: db
ds 1 ds 1
sMysteryGiftTrainerHouseFlag:: db sMysteryGiftTrainerHouseFlag:: db
sMysteryGiftPartnerName:: ds NAME_LENGTH sMysteryGiftPartnerName:: ds NAME_LENGTH
s0_ac09:: ds 1 ds 1
sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
sBackupMysteryGiftItemEnd:: sBackupMysteryGiftItemEnd::