diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 24 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 0606f64b1..d599ffc5c 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -975,17 +975,17 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - dba Invalid_0x96c2d ; PLAYEREVENT_NONE - dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER - dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER - dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL - dba EdgeWarpScript ; PLAYEREVENT_CONNECTION - dba WarpToNewMapScript ; PLAYEREVENT_WARP - dba FallIntoMapScript ; PLAYEREVENT_FALL - dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT - dba HatchEggScript ; PLAYEREVENT_HATCH - dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING - dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) + dba Invalid_0x96c2d ; PLAYEREVENT_NONE + dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER + dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER + dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL + dba EdgeWarpScript ; PLAYEREVENT_CONNECTION + dba WarpToNewMapScript ; PLAYEREVENT_WARP + dba FallIntoMapScript ; PLAYEREVENT_FALL + dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT + dba HatchEggScript ; PLAYEREVENT_HATCH + dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING + dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) Invalid_0x96c2d: end @@ -1019,7 +1019,7 @@ LandAfterPitfallScript: end EdgeWarpScript: ; 4 - reloadandreturn MAPSETUP_CONNECTION + reloadend MAPSETUP_CONNECTION ChangeDirectionScript: ; 9 deactivatefacing 3 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 708dedf50..ded6a0ad1 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -207,9 +207,9 @@ ScriptCommandTable: dw Script_prioritysjump ; 8d dw Script_warpcheck ; 8e dw Script_stopandsjump ; 8f - dw Script_return ; 90 + dw Script_endcallback ; 90 dw Script_end ; 91 - dw Script_reloadandreturn ; 92 + dw Script_reloadend ; 92 dw Script_endall ; 93 dw Script_pokemart ; 94 dw Script_elevator ; 95 @@ -2186,7 +2186,7 @@ Script_newloadmap: call StopScript ret -Script_reloadandreturn: +Script_reloadend: call Script_newloadmap jp Script_end @@ -2265,7 +2265,7 @@ Script_end: call StopScript ret -Script_return: +Script_endcallback: call ExitScriptSubroutine jr c, .dummy .dummy |