diff options
Diffstat (limited to 'engine/overworld/events.asm')
| -rw-r--r-- | engine/overworld/events.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index d00796b7..46811d2f 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -386,7 +386,7 @@ SetMinTwoStepWildEncounterCooldown: Dummy_CheckScriptFlags3Bit5: call CheckBit5_ScriptFlags3 ret z - call Function2ffe + call SetXYCompareFlags ret RunSceneScript: @@ -963,7 +963,7 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - dba Invalid_0x96b60 ; PLAYEREVENT_NONE + dba InvalidEventScript ; PLAYEREVENT_NONE dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL @@ -973,12 +973,12 @@ PlayerEventScriptPointers: dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT dba HatchEggScript ; PLAYEREVENT_HATCH dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING - dba Invalid_0x96b60 ; (NUM_PLAYER_EVENTS) + dba InvalidEventScript ; (NUM_PLAYER_EVENTS) -Invalid_0x96b60: +InvalidEventScript: end -; unused +UnusedPlayerEventScript: ; unreferenced end HatchEggScript: @@ -993,12 +993,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 |