Identify some more unnamed labels

This commit is contained in:
Rangi
2020-10-04 19:43:28 -04:00
parent 5a546068a8
commit 306c85750e
23 changed files with 66 additions and 66 deletions

View File

@@ -158,7 +158,7 @@ CmdQueue_Null:
ret
CmdQueue_Type1:
call Function2f3e
call SetXYCompareFlags
ret
CmdQueue_Type4:

View File

@@ -834,7 +834,7 @@ WhichSidePutAwayText:
DecoAction_AskWhichSide:
call MenuTextbox
ld hl, MenuHeader_0x26eab
ld hl, DecoSideMenuHeader
call GetMenu2
call ExitMenu
call CopyMenuData
@@ -867,13 +867,13 @@ QueryWhichSide:
pop de
ret
MenuHeader_0x26eab:
DecoSideMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 13, 7
dw MenuData_0x26eb3
dw .MenuData
db 1 ; default option
MenuData_0x26eb3:
.MenuData:
db STATICMENU_CURSOR ; flags
db 3 ; items
db "RIGHT SIDE@"

View File

@@ -399,7 +399,7 @@ SetMinTwoStepWildEncounterCooldown:
Dummy_CheckScriptFlags3Bit5:
call CheckBit5_ScriptFlags3
ret z
call Function2f3e
call SetXYCompareFlags
ret
RunSceneScript:
@@ -975,7 +975,7 @@ DoPlayerEvent:
PlayerEventScriptPointers:
; entries correspond to PLAYEREVENT_* constants
dba Invalid_0x96c2d ; PLAYEREVENT_NONE
dba InvalidEventScript ; PLAYEREVENT_NONE
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER
dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL
@@ -985,12 +985,12 @@ PlayerEventScriptPointers:
dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
dba InvalidEventScript ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d:
InvalidEventScript:
end
; unused
UnusedPlayerEventScript: ; unreferenced
end
HatchEggScript:
@@ -1005,12 +1005,12 @@ WarpToNewMapScript:
FallIntoMapScript:
newloadmap MAPSETUP_FALL
playsound SFX_KINESIS
applymovement PLAYER, MovementData_0x96c48
applymovement PLAYER, .SkyfallMovement
playsound SFX_STRENGTH
scall LandAfterPitfallScript
end
MovementData_0x96c48:
.SkyfallMovement:
skyfall
step_end
@@ -1018,10 +1018,10 @@ LandAfterPitfallScript:
earthquake 16
end
EdgeWarpScript: ; 4
EdgeWarpScript:
reloadend MAPSETUP_CONNECTION
ChangeDirectionScript: ; 9
ChangeDirectionScript:
deactivatefacing 3
callasm EnableWildEncounters
end

View File

@@ -364,7 +364,7 @@ DoPlayerMovement::
and 7
ld e, a
ld d, 0
ld hl, .data_8021e
ld hl, .ledge_table
add hl, de
ld a, [wFacingDirection]
and [hl]
@@ -382,7 +382,7 @@ DoPlayerMovement::
xor a
ret
.data_8021e
.ledge_table
db FACE_RIGHT ; COLL_HOP_RIGHT
db FACE_LEFT ; COLL_HOP_LEFT
db FACE_UP ; COLL_HOP_UP