diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:33 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:33 -0400 |
| commit | 9a48c7ba6bfe534082b372a26c836c789c66c26c (patch) | |
| tree | 7b3ae89ed91aa0f34c9b330bf2a8823a6d278dad /engine | |
| parent | a6916c47b02d440c0127f4f135107875607bea48 (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 | 28 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 8 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 4 |
6 files changed, 23 insertions, 23 deletions
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 98a6e25a..e6de6f19 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 c21c3347..245a213b 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -555,7 +555,7 @@ InitializeEventsScript: setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_INITIALIZED_EVENTS - return + endcallback AskNumber1MScript: writetext AskNumber1MText diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 15ea07a3..4b4ff375 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 c55e58de..d00796b7 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -963,17 +963,17 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - dba Invalid_0x96b60 ; 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_0x96b60 ; (NUM_PLAYER_EVENTS) + dba Invalid_0x96b60 ; 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_0x96b60 ; (NUM_PLAYER_EVENTS) Invalid_0x96b60: end @@ -1006,10 +1006,10 @@ LandAfterPitfallScript: earthquake 16 end -EdgeWarpScript: ; 4 - reloadandreturn MAPSETUP_CONNECTION +EdgeWarpScript: + reloadend MAPSETUP_CONNECTION -ChangeDirectionScript: ; 9 +ChangeDirectionScript: deactivatefacing 3 callasm EnableWildEncounters end diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 11f3fc45..3ebc8dd4 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -206,9 +206,9 @@ ScriptCommandTable: dw Script_prioritysjump ; 8c dw Script_warpcheck ; 8d dw Script_stopandsjump ; 8e - dw Script_return ; 8f + dw Script_endcallback ; 8f dw Script_end ; 90 - dw Script_reloadandreturn ; 91 + dw Script_reloadend ; 91 dw Script_endall ; 92 dw Script_pokemart ; 93 dw Script_elevator ; 94 @@ -2072,7 +2072,7 @@ Script_newloadmap: call StopScript ret -Script_reloadandreturn: +Script_reloadend: call Script_newloadmap jp Script_end @@ -2157,7 +2157,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 2b939033..7b2646ed 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -387,11 +387,11 @@ Function901a1: LoadPhoneScriptBank: memcall wPhoneScriptBank - return + endcallback LoadOutOfAreaScript: scall PhoneOutOfAreaScript - return + endcallback LoadCallerScript: nop |