summaryrefslogtreecommitdiff
path: root/engine/overworld/scripting.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 08:37:33 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 08:37:33 -0400
commit9a48c7ba6bfe534082b372a26c836c789c66c26c (patch)
tree7b3ae89ed91aa0f34c9b330bf2a8823a6d278dad /engine/overworld/scripting.asm
parenta6916c47b02d440c0127f4f135107875607bea48 (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 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