diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:03 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:03 -0400 |
| commit | ef452ccbc7e448a490d1d081c63088cce7b73b0b (patch) | |
| tree | e62340148538cadddfe94e69643fc496c4d1d534 /engine | |
| parent | 2e8b4836b072602d1c200b1f9735e3e0c4242985 (diff) | |
return → endcallback, reloadandreturn → reloadend
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/poisonstep.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 | ||||
| -rw-r--r-- | engine/events/whiteout.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 24 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 8 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 98a6e25a1..e6de6f19f 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -115,7 +115,7 @@ DoPoisonStep:: end .whiteout - farsjump Script_OverworldWhiteout + farsjump OverworldWhiteoutScript .CheckWhitedOut: xor a diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index edd596a24..53465e0de 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -614,7 +614,7 @@ InitializeEventsScript: setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_INITIALIZED_EVENTS - return + endcallback AskNumber1MScript: special RandomPhoneMon diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 6daa8075d..02f60f0e0 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -2,7 +2,7 @@ Script_BattleWhiteout:: callasm BattleBGMap sjump Script_Whiteout -Script_OverworldWhiteout:: +OverworldWhiteoutScript:: refreshscreen callasm OverworldBGMap 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 diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 042fe38f3..5156ca911 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -380,11 +380,11 @@ Function90199: LoadPhoneScriptBank: memcall wPhoneScriptBank - return + endcallback LoadOutOfAreaScript: scall PhoneOutOfAreaScript - return + endcallback LoadCallerScript: nop |