diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/script_pokemon_util_80A0058.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/script_pokemon_util_80A0058.s')
| -rw-r--r-- | asm/script_pokemon_util_80A0058.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 60f416b48..6b4cdd1a8 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -411,13 +411,13 @@ _080A0368: movs r0, 0x1 strh r0, [r1] _080A036E: - ldr r0, _080A037C @ =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, _080A037C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _080A0378: .4byte gSpecialVar_Result -_080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music +_080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_80A0350 thumb_func_start sub_80A0380 @@ -455,14 +455,14 @@ _080A03B8: movs r0, 0x1 strh r0, [r1] _080A03C2: - ldr r0, _080A03D4 @ =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, _080A03D4 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 pop {r4} pop {r0} bx r0 .align 2, 0 _080A03D0: .4byte gSpecialVar_Result -_080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music +_080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_80A039C thumb_func_start sub_80A03D8 |