diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/cmd_queue.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/decorations.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 18 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm index e482f789b..3e1b09db5 100644 --- a/engine/overworld/cmd_queue.asm +++ b/engine/overworld/cmd_queue.asm @@ -158,7 +158,7 @@ CmdQueue_Null: ret CmdQueue_Type1: - call Function2f3e + call SetXYCompareFlags ret CmdQueue_Type4: diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 67a07e5db..6c56330ed 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -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@" diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index d599ffc5c..e7ef5c727 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -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 diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index e2b92b1cf..fcf147dd0 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -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 |