diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
| commit | c9603c40d86053a571023845b5c32c8ff381cabe (patch) | |
| tree | d79f28da3ffd3c2eff489c62072204395cccfc2b /asm/start_menu.s | |
| parent | 8731a8caa5602a516972329f7aa0624794b29ff2 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index 44d477050..f71df1046 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -362,7 +362,7 @@ sub_809FA9C: @ 809FA9C _0809FAB2: ldr r0, =sub_809FA34 bl sub_809F9D0 - bl script_env_2_enable + bl ScriptContext2_Enable pop {r0} bx r0 .pool @@ -731,7 +731,7 @@ sub_809FDD4: @ 809FDD4 bl sub_80984F4 ldr r0, =sub_809FA34 bl sub_809F9D0 - bl script_env_2_enable + bl ScriptContext2_Enable pop {r0} bx r0 .pool @@ -805,7 +805,7 @@ _0809FE7C: movs r1, 0x1 bl sub_8197DF8 bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable bl sub_81A9EC8 movs r0, 0x1 b _0809FE96 @@ -867,7 +867,7 @@ _0809FF00: movs r1, 0x1 bl sub_8197DF8 bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable ldr r0, =gUnknown_08252C88 bl ScriptContext1_SetupScript movs r0, 0x1 @@ -985,7 +985,7 @@ _0809FFFC: _080A0000: adds r0, r4, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts _080A000A: pop {r4} pop {r0} @@ -2022,7 +2022,7 @@ sub_80A08A4: @ 80A08A4 bne _080A08C0 adds r0, r4, 0 bl DestroyTask - bl script_env_2_enable_and_set_ctx_running + bl EnableBothScriptContexts _080A08C0: pop {r4} pop {r0} @@ -2072,7 +2072,7 @@ sub_80A0914: @ 80A0914 bl sub_819746C bl remove_start_menu_window_maybe bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable pop {r0} bx r0 thumb_func_end sub_80A0914 |