summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 08:37:03 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 08:37:03 -0400
commitef452ccbc7e448a490d1d081c63088cce7b73b0b (patch)
treee62340148538cadddfe94e69643fc496c4d1d534 /engine/events
parent2e8b4836b072602d1c200b1f9735e3e0c4242985 (diff)
return → endcallback, reloadandreturn → reloadend
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/poisonstep.asm2
-rw-r--r--engine/events/std_scripts.asm2
-rw-r--r--engine/events/whiteout.asm2
3 files changed, 3 insertions, 3 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