diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-08 08:07:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 08:07:53 -0400 |
| commit | 39d68ebd445be5657a916dec1b4872717e9c40d3 (patch) | |
| tree | 4394601f49f220e3c32d9879a3c26284c9c92771 /asm/battle_tower.s | |
| parent | 7980c4aa071685983f84861cc7dc69d6daf30a90 (diff) | |
| parent | 122f1395823cfa3dfd96842c61411ad29700f8de (diff) | |
Merge pull request #77 from jiangzhengwenjz/misc
corrected sprite.h + finished safari_zone, list_menu, menu_indicators, field_poison, buy_menu_helpers, dynamic_placeholder_text_util
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 503a6343e..01ac780a2 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2010,14 +2010,14 @@ _080E68A8: .4byte gPlayerParty _080E68AC: bl sub_80E7550 _080E68B0: - ldr r0, _080E68C0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, _080E68C0 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E68C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music +_080E68C0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_80E6854 thumb_func_start sub_80E68C4 |