From ef452ccbc7e448a490d1d081c63088cce7b73b0b Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jul 2020 08:37:03 -0400 Subject: =?UTF-8?q?return=20=E2=86=92=20endcallback,=20reloadandreturn=20?= =?UTF-8?q?=E2=86=92=20reloadend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/overworld/scripting.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld/scripting.asm') 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 -- cgit v1.2.3