summaryrefslogtreecommitdiff
path: root/engine/overworld/scripting.asm
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/overworld/scripting.asm
parent2e8b4836b072602d1c200b1f9735e3e0c4242985 (diff)
return → endcallback, reloadandreturn → reloadend
Diffstat (limited to 'engine/overworld/scripting.asm')
-rw-r--r--engine/overworld/scripting.asm8
1 files changed, 4 insertions, 4 deletions
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