From f1841ef24d63aa2425d4316b9f49408d90c29bdb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Mar 2020 08:57:52 -0400 Subject: through sub_805D1A8 --- asm/overworld.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'asm/overworld.s') diff --git a/asm/overworld.s b/asm/overworld.s index f12288d23..5335cfc21 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -1715,7 +1715,7 @@ sub_8055864: @ 8055864 bl SetSav1WeatherFromCurrMapHeader bl sub_805610C bl sub_8055CB8 - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl TryRegenerateRenewableHiddenItems bl InitMap @@ -1792,7 +1792,7 @@ sub_8055920: @ 8055920 bl FlagClear _08055974: bl sub_8055CB8 - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl TryRegenerateRenewableHiddenItems bl UpdateLocationHistoryForRoamer @@ -2474,8 +2474,8 @@ Overworld_SetSavedMusic: @ 8055E78 _08055E80: .4byte gSaveBlock1Ptr thumb_func_end Overworld_SetSavedMusic - thumb_func_start sav1_reset_battle_music_maybe -sav1_reset_battle_music_maybe: @ 8055E84 + thumb_func_start Overworld_ClearSavedMusic +Overworld_ClearSavedMusic: @ 8055E84 ldr r0, _08055E90 @ =gSaveBlock1Ptr ldr r1, [r0] movs r0, 0 @@ -2483,7 +2483,7 @@ sav1_reset_battle_music_maybe: @ 8055E84 bx lr .align 2, 0 _08055E90: .4byte gSaveBlock1Ptr - thumb_func_end sav1_reset_battle_music_maybe + thumb_func_end Overworld_ClearSavedMusic thumb_func_start sub_8055E94 sub_8055E94: @ 8055E94 -- cgit v1.2.3