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_records.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_records.s')
| -rw-r--r-- | asm/battle_records.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_records.s b/asm/battle_records.s index e48a0025e..d0a99b4cf 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -287,7 +287,7 @@ sub_80CD460: @ 80CD460 ands r0, r1 cmp r0, 0 bne _080CD490 - ldr r0, _080CD49C @ =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, _080CD49C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic bl SetMainCallback2 ldr r0, _080CD4A0 @ =gUnknown_2039A1C ldr r0, [r0] @@ -303,7 +303,7 @@ _080CD490: bx r0 .align 2, 0 _080CD498: .4byte gPaletteFade -_080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music +_080CD49C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _080CD4A0: .4byte gUnknown_2039A1C thumb_func_end sub_80CD460 |