diff --git a/data/data_80CE77C_2.s b/data/data_80CE77C_2.s deleted file mode 100644 index ae65a615f..000000000 --- a/data/data_80CE77C_2.s +++ /dev/null @@ -1,34 +0,0 @@ - .section .rodata - - .align 2,0 - - - .global gUnknown_80D4144 -gUnknown_80D4144: @ 80D4144 - .2byte 302 - .2byte 303 - .2byte 303 - .2byte 301 - .2byte 304 - .2byte 306 - .2byte 307 - .2byte 0 - - .string "pksdir0\0" - .string "pksdir0\0" - .4byte noneText - .byte 0xff, 0xff, 0xff, 0xff - .4byte noneText - - .global noneText - noneText: - .string "none\0" - .align 2,0 - - .4byte defaultText - .byte 0xff, 0xff, 0xff, 0xff - .4byte noneText - - .global defaultText - defaultText: - .string "default\0" diff --git a/include/code_80118A4.h b/include/code_80118A4.h deleted file mode 100644 index d81f7636a..000000000 --- a/include/code_80118A4.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef GUARD_CODE_80118A4_H -#define GUARD_CODE_80118A4_H - -void FadeOutAllMusic(u16); -void PlayMenuSoundEffect(u32); -void PlaySound(u16); -void StopAllMusic_1(void); -void sub_801180C(void); -void sub_8011830(void); -void sub_8011860(void); -void FadeInNewBGM_(u16 songIndex, u16 speed); -void FadeOutBGM_(u16 speed); -void FadeOutSound(u16 songIndex, u16 speed); -void QueueBGM_(u16 songIndex); -void PlaySoundWithVolume(u16 songIndex, u16 volume); -void StartBGMusic(void); -void xxx_call_start_new_bgm(u16 songIndex); -void StopBGMusic(void); -void StopSound(u16 songIndex); - -#endif // GUARD_CODE_80118A4_H diff --git a/include/music_util.h b/include/music_util.h new file mode 100644 index 000000000..b26301dab --- /dev/null +++ b/include/music_util.h @@ -0,0 +1,24 @@ +#ifndef GUARD_MUSIC_UTIL_H +#define GUARD_MUSIC_UTIL_H + +void ResetSoundEffectCounters(void); +void StopBGMResetSoundEffectCounters(void); +void StartBGMusic(void); +void UpdateSoundEffectCounters(void); +void StopAllMusic_1(void); +void FadeOutAllMusic(u16); +void StartNewBGM_(u16 songIndex); +void FadeInNewBGM_(u16 songIndex, u16 speed); +void QueueBGM_(u16 songIndex); +void StopBGMusic(void); +void FadeOutBGM_(u16 speed); +bool8 IsEqualtoBGTrack(u16 songIndex); +void PlaySoundWithVolume(u16 songIndex, u16 volume); +void PlaySound(u16 songIndex); +void StopSound(u16 songIndex); +void FadeOutSound(u16 songIndex, u16 speed); +bool8 IsSoundPlaying(u16 songIndex); +void PlayMenuSoundEffect(u32 arrId); +void sub_8011A04(void); + +#endif // GUARD_MUSIC_UTIL_H diff --git a/ld_script.ld b/ld_script.ld index 2a63ddd25..e6e9a2532 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -451,7 +451,6 @@ SECTIONS { src/friend_areas_map_util.o(.rodata); src/world_map_sound.o(.rodata); src/music_util.o(.rodata); - data/data_80CE77C_2.o(.rodata); src/debug.o(.rodata); src/save.o(.rodata); src/save_read.o(.rodata); diff --git a/src/adventure_log.c b/src/adventure_log.c index 7ef542156..50abf7e12 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -3,7 +3,7 @@ #include "constants/input.h" #include "structs/struct_sub80095e4.h" #include "adventure_log.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8097670.h" #include "input.h" #include "memory.h" diff --git a/src/code_800DAC0.c b/src/code_800DAC0.c index 30ba9dbd8..09cd74f99 100644 --- a/src/code_800DAC0.c +++ b/src/code_800DAC0.c @@ -3,7 +3,7 @@ #include "bg_control.h" #include "code_800DAC0.h" #include "code_800E9A8.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803E724.h" #include "def_filearchives.h" #include "dungeon_map.h" diff --git a/src/code_8012A18.c b/src/code_8012A18.c index 320dc087d..0c30d3175 100644 --- a/src/code_8012A18.c +++ b/src/code_8012A18.c @@ -3,7 +3,7 @@ #include "code_800558C.h" #include "graphics_memory.h" #include "code_800C9CC.h" -#include "code_80118A4.h" +#include "music_util.h" #include "string_format.h" #include "game_options.h" #include "sprite.h" @@ -11,7 +11,7 @@ void sub_8012A18() { - sub_8011860(); + UpdateSoundEffectCounters(); DrawDialogueBoxString(); nullsub_8(gGameOptionsRef->unkA); sub_8005180(); diff --git a/src/code_8015080.c b/src/code_8015080.c index f547dc339..b61f00881 100644 --- a/src/code_8015080.c +++ b/src/code_8015080.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803D0D8.h" #include "input.h" #include "memory.h" diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index 1185ff818..6deae7926 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "string_format.h" #include "code_801AFA4.h" #include "code_8099360.h" diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index 869febe5c..76258d19d 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "input.h" #include "items.h" diff --git a/src/code_801B60C.c b/src/code_801B60C.c index d42ba3f1c..aae966bff 100644 --- a/src/code_801B60C.c +++ b/src/code_801B60C.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/colors.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801B60C.h" #include "code_8099360.h" diff --git a/src/code_801C8C4.c b/src/code_801C8C4.c index 18fefa423..8954129b1 100644 --- a/src/code_801C8C4.c +++ b/src/code_801C8C4.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801C8C4.h" #include "input.h" #include "items.h" diff --git a/src/code_801D9E4.c b/src/code_801D9E4.c index e49db9059..b2a40b3dd 100644 --- a/src/code_801D9E4.c +++ b/src/code_801D9E4.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/input.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801D9E4.h" #include "ground_main.h" #include "input.h" diff --git a/src/code_801EE10.c b/src/code_801EE10.c index c70dda660..579a96fb9 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801EE10.h" #include "input.h" #include "items.h" diff --git a/src/code_801F428.c b/src/code_801F428.c index b96e35540..8878c1858 100644 --- a/src/code_801F428.c +++ b/src/code_801F428.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "structs/struct_sub80095e4.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "memory.h" #include "menu_input.h" diff --git a/src/code_801F808.c b/src/code_801F808.c index 7682e2653..43bb8fa92 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "structs/menu.h" #include "structs/str_text.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "memory.h" #include "menu_input.h" diff --git a/src/code_80227B8.c b/src/code_80227B8.c index d7a4bf8a4..0cfc473f8 100644 --- a/src/code_80227B8.c +++ b/src/code_80227B8.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/colors.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801AFA4.h" #include "code_801B3C0.h" #include "code_80227B8.h" diff --git a/src/code_8023144.c b/src/code_8023144.c index c5d8565ef..d7fbe641c 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -3,7 +3,7 @@ #include "constants/colors.h" #include "constants/input.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8023144.h" #include "exclusive_pokemon.h" #include "friend_area.h" diff --git a/src/code_8024458.c b/src/code_8024458.c index 3997054c0..4c414fdd4 100644 --- a/src/code_8024458.c +++ b/src/code_8024458.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8024458.h" #include "event_flag.h" #include "input.h" diff --git a/src/code_802DE84.c b/src/code_802DE84.c index 5dbceb436..f731d9706 100644 --- a/src/code_802DE84.c +++ b/src/code_802DE84.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_802DE84.h" #include "input.h" #include "memory.h" diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 471dcabf4..270bcd092 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -3,7 +3,7 @@ #include "constants/wonder_mail.h" #include "constants/colors.h" #include "structs/str_dungeon.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "input.h" diff --git a/src/code_806FDF4.c b/src/code_806FDF4.c index 648c4a762..a4301e022 100644 --- a/src/code_806FDF4.c +++ b/src/code_806FDF4.c @@ -4,7 +4,7 @@ #include "structs/str_pokemon.h" #include "dungeon_main.h" #include "dungeon_misc.h" -#include "code_80118A4.h" +#include "music_util.h" #include "dungeon_message.h" #include "code_806CD90.h" #include "code_8077274_1.h" diff --git a/src/code_8072F3C.c b/src/code_8072F3C.c index 253af4a9c..2bc55138c 100644 --- a/src/code_8072F3C.c +++ b/src/code_8072F3C.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/input.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_80958E8.h" #include "code_80A26CC.h" #include "input.h" diff --git a/src/code_8099360.c b/src/code_8099360.c index 256e5db13..94e016e6a 100644 --- a/src/code_8099360.c +++ b/src/code_8099360.c @@ -77,7 +77,7 @@ UNUSED static void sub_80993F0(void) " sub sp, 0x28\n" " movs r0, 0\n" " mov r10, r0\n" -" bl sub_801180C\n" +" bl ResetSoundEffectCounters\n" " movs r0, 0x10\n" " bl FadeOutAllMusic\n" " ldr r1, _0809948C\n" @@ -288,7 +288,7 @@ UNUSED static void sub_80993F0(void) " bl sub_8005180\n" " bl sub_8099BE4\n" " bl sub_8099744\n" -" bl sub_8011860\n" +" bl UpdateSoundEffectCounters\n" " bl WaitForNextFrameAndAdvanceRNG\n" " bl LoadBufferedInputs\n" " bl nullsub_120\n" diff --git a/src/code_809A560.c b/src/code_809A560.c index 009c55c13..292f076cc 100644 --- a/src/code_809A560.c +++ b/src/code_809A560.c @@ -4,7 +4,7 @@ #include "structs/str_3001B64.h" #include "code_800558C.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801D014.h" #include "code_8099360.h" #include "credits2.h" diff --git a/src/code_809C5C4.c b/src/code_809C5C4.c index d37abfe6c..d0b41d5d7 100644 --- a/src/code_809C5C4.c +++ b/src/code_809C5C4.c @@ -6,7 +6,7 @@ #include "ground_main.h" #include "code_80A26CC.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "string_format.h" #include "input.h" #include "ground_lives.h" diff --git a/src/debug.c b/src/debug.c index d347bace2..7b8bd6f80 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1,8 +1,14 @@ #include "global.h" +#include "globaldata.h" #include "debug.h" EWRAM_INIT static bool32 gNDS_DebugEnabled = {0}; // NDS=020EACE4 -EWRAM_INIT static u8 gUnknown_203B150 = {0}; +EWRAM_INIT static u8 sUnknown_203B150 = {0}; + +ALIGNED(4) UNUSED static const char debug_fill18[] = "pksdir0"; + +UNUSED static const DebugLocation sUnusedDebugLoc1 = {"none", -1, "none"}; +UNUSED static const DebugLocation sUnusedDebugLoc2 = {"default", -1, "none"}; ALIGNED(4) static const char gFuncFileLineString[] = "func = '%s'\nfile = '%s' line = %5d"; @@ -11,9 +17,9 @@ ALIGNED(4) static const char gFuncFileLineStringWPrefix[] = "%sfunc = '%s'\nfile ALIGNED(4) static const char gFuncFileLineString2[] = "func = '%s'\nfile = '%s' line = %5d\n"; -ALIGNED(4) static const char debug_fill14[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill14[] = "pksdir0"; ALIGNED(4) static const char gDebugPrintPrefix[] = " Print "; -ALIGNED(4) static const char debug_fill13[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill13[] = "pksdir0"; EWRAM_INIT UNUSED static const char *sUnusedEwramDebugStrings[] = { @@ -30,22 +36,22 @@ EWRAM_INIT UNUSED static const char *sUnusedEwramDebugStrings[] = }; ALIGNED(4) static const char gNotMountText[] = "not mount log system"; -ALIGNED(4) static const char debug_fill9[] = "pksdir0"; -ALIGNED(4) static const char debug_fill10[] = "pksdir0"; -ALIGNED(4) static const char debug_fill11[] = "pksdir0"; -ALIGNED(4) static const char debug_fill12[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill9[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill10[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill11[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill12[] = "pksdir0"; ALIGNED(4) static const char gFatalText[] = "!!!!! Fatal !!!!!\n"; ALIGNED(4) static const char gFatalErrorBufferPlaceholder[] = "%s\n"; -ALIGNED(4) static const char debug_fill0[] = "pksdir0"; -ALIGNED(4) static const char debug_fill1[] = "pksdir0"; -ALIGNED(4) static const char debug_fill2[] = "pksdir0"; -ALIGNED(4) static const char debug_fill3[] = "pksdir0"; -ALIGNED(4) static const char debug_fill4[] = "pksdir0"; -ALIGNED(4) static const char debug_fill5[] = "pksdir0"; -ALIGNED(4) static const char debug_fill6[] = "pksdir0"; -ALIGNED(4) static const char debug_fill7[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill0[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill1[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill2[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill3[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill4[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill5[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill6[] = "pksdir0"; +ALIGNED(4) UNUSED static const char debug_fill7[] = "pksdir0"; // NORETURN attribute required for Modern #ifdef MODERN @@ -122,23 +128,23 @@ static void nullsub_27(void) UNUSED static void sub_8011B08(void) { - gUnknown_203B150 = 1; + sUnknown_203B150 = 1; } UNUSED static void sub_8011B14(void) { - gUnknown_203B150 = 0; + sUnknown_203B150 = 0; } UNUSED static u8 sub_8011B20(void) { - gUnknown_203B150 = !gUnknown_203B150; - return gUnknown_203B150; + sUnknown_203B150 = !sUnknown_203B150; + return sUnknown_203B150; } UNUSED static u8 sub_8011B3C(void) { - return gUnknown_203B150; + return sUnknown_203B150; } UNUSED static void nullsub_137(void) diff --git a/src/dungeon_music.c b/src/dungeon_music.c index 4082bd008..277184324 100644 --- a/src/dungeon_music.c +++ b/src/dungeon_music.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/bg_music.h" #include "structs/menu.h" -#include "code_80118A4.h" +#include "music_util.h" #include "dungeon_info.h" #include "dungeon_music.h" #include "music.h" diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c index 55ed1a4a7..a59a21641 100644 --- a/src/dungeon_tilemap.c +++ b/src/dungeon_tilemap.c @@ -29,7 +29,7 @@ #include "text_1.h" #include "play_time.h" #include "code_800C9CC.h" -#include "code_80118A4.h" +#include "music_util.h" #include "dungeon_strings.h" #include "run_dungeon.h" @@ -731,7 +731,7 @@ void sub_8040094(u8 r0) LoadBufferedInputs(); xxx_call_update_bg_sound_input(); UpdateDungeonMusic(); - sub_8011860(); + UpdateSoundEffectCounters(); } static const s32 gUnknown_80F6568[] = { diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c index 3b42049e3..afd20c20c 100644 --- a/src/dungeon_vram.c +++ b/src/dungeon_vram.c @@ -8,7 +8,7 @@ #include "code_800558C.h" #include "graphics_memory.h" #include "code_800C9CC.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803E724.h" #include "dungeon_map.h" #include "dungeon_music.h" @@ -233,7 +233,7 @@ static void sub_803E490(u32 unused) gDungeon->unk181e8.unk18213 = 0; UpdateDungeonMusic(); - sub_8011860(); + UpdateSoundEffectCounters(); TryResetDungeonMapTilesScheduledForCopy(); ResetSprites(FALSE); nullsub_10(FALSE); @@ -261,7 +261,7 @@ void sub_803E668(u32 unused) xxx_call_update_bg_vram(); xxx_call_update_bg_sound_input(); gDungeon->unk181e8.unk18213 = 0; - sub_8011860(); + UpdateSoundEffectCounters(); ResetSprites(FALSE); nullsub_10(FALSE); gUnknown_202EDD4--; diff --git a/src/felicity_bank.c b/src/felicity_bank.c index f14290bd4..d0d4c1226 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "common_strings.h" #include "felicity_bank.h" #include "input.h" diff --git a/src/friend_areas_map.c b/src/friend_areas_map.c index 2a396b16b..0f6c38187 100644 --- a/src/friend_areas_map.c +++ b/src/friend_areas_map.c @@ -8,7 +8,7 @@ #include "graphics_memory.h" #include "code_800C9CC.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "decompress_sir.h" #include "friend_area.h" #include "friend_areas_map.h" diff --git a/src/friend_areas_map_util.c b/src/friend_areas_map_util.c index 9ac7617e5..e14303604 100644 --- a/src/friend_areas_map_util.c +++ b/src/friend_areas_map_util.c @@ -8,7 +8,7 @@ #include "graphics_memory.h" #include "code_800C9CC.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "decompress_at.h" #include "def_filearchives.h" #include "friend_area.h" @@ -390,6 +390,6 @@ void FriendAreasMap_RunFrameActions(void) xxx_call_update_bg_vram(); DoScheduledMemCopies(); xxx_call_update_bg_sound_input(); - sub_8011860(); + UpdateSoundEffectCounters(); ResetSprites(FALSE); } diff --git a/src/friend_list.c b/src/friend_list.c index f4060b50e..c0d7ac6b7 100644 --- a/src/friend_list.c +++ b/src/friend_list.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "friend_list.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "pokemon.h" #include "structs/str_text.h" #include "text_util.h" diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index 7c8a78298..33c656fb7 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/dungeon.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801602C.h" #include "code_801B3C0.h" #include "code_801EE10.h" diff --git a/src/friend_rescue.c b/src/friend_rescue.c index cafb366c0..55b0c4040 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -4,7 +4,7 @@ #include "constants/monster.h" #include "constants/wonder_mail.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "friend_list.h" @@ -956,7 +956,7 @@ void sub_8032828(void) break; case 0x7: gUnknown_203B33C->status = 0; - sub_8011830(); + StopBGMResetSoundEffectCounters(); gUnknown_203B33C->status = sub_8037B28(gUnknown_203B33C->unk40); if (gUnknown_203B33C->status == 0) { switch (gUnknown_203B33C->unk40) { @@ -1097,7 +1097,7 @@ void sub_8032828(void) break; case 0x6A: gUnknown_203B33C->status = 0; - sub_8011830(); + StopBGMResetSoundEffectCounters(); gUnknown_203B33C->status = sub_8037B28(gUnknown_203B33C->unk40); if (gUnknown_203B33C->status == 0) { switch (gUnknown_203B33C->unk40) { diff --git a/src/ground_main.c b/src/ground_main.c index 9204df586..342dbe5e0 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -5,7 +5,7 @@ #include "structs/str_dungeon_setup.h" #include "graphics_memory.h" #include "code_800C9CC.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_80958E8.h" #include "code_8099360.h" #include "code_80A26CC.h" @@ -115,7 +115,7 @@ extern void sub_809CA20(void); extern void sub_80A6E80(void); extern void sub_8099BE4(void); extern void sub_8099744(void); -extern void sub_8011860(void); +extern void UpdateSoundEffectCounters(void); extern void IncrementPlayTime(struct PlayTimeStruct *); extern void WaitForNextFrameAndAdvanceRNG(void); extern void LoadBufferedInputs(void); @@ -138,7 +138,6 @@ extern void UpdateAdventureAchievements(void); extern void xxx_call_update_bg_sound_input(void); extern void sub_80A6E68(void); extern void sub_80060EC(void); -extern void sub_801180C(void); extern void ScriptPrintNullTextbox(void); extern void sub_809977C(void); extern void GroundMap_ExecuteEvent(s32, u32); @@ -192,7 +191,7 @@ u32 xxx_script_related_8098468(s32 param_1) default: break; } - sub_801180C(); + ResetSoundEffectCounters(); if (gUnknown_20398B9 == 0 && !sub_80023E4(0xd)) { FadeOutAllMusic(0x10); } @@ -376,7 +375,7 @@ u32 xxx_script_related_8098468(s32 param_1) sub_80A6E80(); sub_8099BE4(); sub_8099744(); - sub_8011860(); + UpdateSoundEffectCounters(); IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); @@ -489,7 +488,7 @@ void sub_8098BDC(void) sub_80A6E80(); sub_8099BE4(); sub_8099744(); - sub_8011860(); + UpdateSoundEffectCounters(); IncrementPlayTime(gPlayTimeRef); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); diff --git a/src/ground_script.c b/src/ground_script.c index 2b13f2ea3..5e2fc9363 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -6,7 +6,7 @@ #include "constants/monster.h" #include "constants/move_id.h" #include "code_8002774.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8099360.h" #include "code_8094F88.h" #include "code_80958E8.h" @@ -127,8 +127,6 @@ void DeleteGroundLives(void); void DeleteGroundObjects(void); void DeleteGroundEffects(void); s32 ExecuteScriptCommand(Action *action); -bool8 IsSoundPlaying(u16 songIndex); -bool8 IsEqualtoBGTrack(u16 songIndex); bool8 sub_8099B94(void); PixelPos SetVecFromDirectionSpeed(s8, s32); bool8 sub_8098DCC(u32 speed); @@ -2035,7 +2033,7 @@ s32 ExecuteScriptCommand(Action *action) case 0x44: { u16 id = curCmd.argByte == 0 ? sub_80A25AC((u16)curCmd.arg1) : curCmd.arg1; if (id != 999) { - xxx_call_start_new_bgm((u16)id); + StartNewBGM_((u16)id); } else { StopBGMusic(); } @@ -3841,7 +3839,7 @@ s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3) case 0x44: if (gUnknown_2039DA8 != STOP_BGM) { - xxx_call_start_new_bgm(gUnknown_2039DA8); + StartNewBGM_(gUnknown_2039DA8); gUnknown_2039DA8 = STOP_BGM; return 1; } diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index 2d33c621e..46d5a468e 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" #include "common_strings.h" diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index 2169b6d96..1b07997e1 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" #include "friend_list.h" diff --git a/src/hints_menu1.c b/src/hints_menu1.c index 5f6df9848..de9bbcf90 100644 --- a/src/hints_menu1.c +++ b/src/hints_menu1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "common_strings.h" #include "hints_menu1.h" #include "input.h" diff --git a/src/hints_menu2.c b/src/hints_menu2.c index b571abf92..8dfb20c9f 100644 --- a/src/hints_menu2.c +++ b/src/hints_menu2.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "common_strings.h" #include "hints_menu2.h" #include "input.h" diff --git a/src/iq_skill_info_menu.c b/src/iq_skill_info_menu.c index 66ba3160f..97a4d4b1d 100644 --- a/src/iq_skill_info_menu.c +++ b/src/iq_skill_info_menu.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8097DD0.h" #include "input.h" #include "iq_skill_info_menu.h" diff --git a/src/iq_skill_list_menu.c b/src/iq_skill_list_menu.c index bd33d3b23..126cff3be 100644 --- a/src/iq_skill_list_menu.c +++ b/src/iq_skill_list_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "iq_skill_list_menu.h" #include "memory.h" diff --git a/src/iq_skill_menu.c b/src/iq_skill_menu.c index 4e6cc7783..10ea67d96 100644 --- a/src/iq_skill_menu.c +++ b/src/iq_skill_menu.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "common_strings.h" #include "input.h" #include "iq_skill_menu.h" diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index fed069a7b..6b82b7d5c 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -3,7 +3,7 @@ #include "structs/menu.h" #include "structs/str_mon_portrait.h" #include "structs/str_text.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_8099360.h" #include "common_strings.h" diff --git a/src/kecleon_bros2.c b/src/kecleon_bros2.c index 447706e57..91795f912 100644 --- a/src/kecleon_bros2.c +++ b/src/kecleon_bros2.c @@ -3,7 +3,7 @@ #include "constants/input.h" #include "structs/struct_sub80095e4.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "items.h" #include "kecleon_bros2.h" diff --git a/src/kecleon_bros3.c b/src/kecleon_bros3.c index 0eed202ea..f758b31c1 100644 --- a/src/kecleon_bros3.c +++ b/src/kecleon_bros3.c @@ -3,7 +3,7 @@ #include "constants/input.h" #include "structs/struct_sub80095e4.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "items.h" #include "kecleon_bros3.h" diff --git a/src/kecleon_bros4.c b/src/kecleon_bros4.c index 3b3d42a22..7d42e6a2a 100644 --- a/src/kecleon_bros4.c +++ b/src/kecleon_bros4.c @@ -5,7 +5,7 @@ #include "structs/menu.h" #include "structs/struct_sub80095e4.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8099360.h" #include "input.h" #include "items.h" diff --git a/src/luminous_cave.c b/src/luminous_cave.c index d0db626bb..2d2302578 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -3,7 +3,7 @@ #include "constants/bg_music.h" #include "constants/colors.h" #include "constants/evolution_status.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801602C.h" #include "code_801B3C0.h" #include "code_8097670.h" diff --git a/src/mailbox.c b/src/mailbox.c index 927bf0a15..30e5fe7e0 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "structs/menu.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_802DE84.h" #include "code_803B050.h" #include "code_80958E8.h" diff --git a/src/main_loops.c b/src/main_loops.c index d37e4ca72..29b0e8b41 100644 --- a/src/main_loops.c +++ b/src/main_loops.c @@ -9,7 +9,7 @@ #include "graphics_memory.h" #include "code_800C9CC.h" #include "code_800D090_1.h" -#include "code_80118A4.h" +#include "music_util.h" #include "run_dungeon.h" #include "code_8094F88.h" #include "code_80958E8.h" @@ -129,7 +129,7 @@ void GameLoop(void) InitHeap(); NDS_DebugInit(); - sub_801180C(); + ResetSoundEffectCounters(); NDS_LoadOverlay_GroundMain(); sub_8014144(); LoadMonsterParameters(); @@ -286,7 +286,7 @@ static void MainLoops_RunFrameActions(u32 unused) // Extra call here in blue. Seems to be for 2nd screen sprites sub_80060EC(); - sub_8011860(); + UpdateSoundEffectCounters(); WaitForNextFrameAndAdvanceRNG(); LoadBufferedInputs(); @@ -566,7 +566,7 @@ static u32 RunGameMode_Async(u32 a0) s32 mode = GetScriptVarValue(NULL, START_MODE); bool8 ret = FALSE; - sub_801180C(); + ResetSoundEffectCounters(); FadeOutAllMusic(0x10); if (mode == MODE_CONTINUE_QUICKSAVE) { if (a0 == 2) { @@ -904,7 +904,7 @@ static void LoadAndRunQuickSaveDungeon_Async(DungeonSetupStruct *setupStr) quickSaveValid = IsQuickSaveValid(); FinishQuickSaveRead(); - sub_8011830(); + StopBGMResetSoundEffectCounters(); if (quickSaveValid) sub_80121E0(0xF1208); diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index 0f171fb62..e61e09b41 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/colors.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B60C.h" #include "code_80A26CC.h" #include "common_strings.h" diff --git a/src/makuhita_dojo2.c b/src/makuhita_dojo2.c index 69d0d8a00..e0e427168 100644 --- a/src/makuhita_dojo2.c +++ b/src/makuhita_dojo2.c @@ -3,7 +3,7 @@ #include "constants/colors.h" #include "constants/input.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_80972F4.h" #include "code_80A26CC.h" #include "dungeon_info.h" diff --git a/src/menu_input.c b/src/menu_input.c index 777f8adeb..f8f0868b2 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -3,7 +3,7 @@ #include "structs/axdata.h" #include "structs/struct_sub80095e4.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "constants/colors.h" #include "constants/input.h" #include "input.h" diff --git a/src/mission_reward.c b/src/mission_reward.c index 755517e15..93b8c07b4 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B60C.h" #include "code_802F204.h" #include "friend_area.h" diff --git a/src/music_util.c b/src/music_util.c index bd4b0c295..757be00d5 100644 --- a/src/music_util.c +++ b/src/music_util.c @@ -1,30 +1,28 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "music.h" #include "constants/bg_music.h" -extern const u16 gUnknown_80D4144[8]; +static EWRAM_DATA u32 sUnknownUnused = {0}; // Unused, only set in an unused function R=202DE1C | B=2134218 +static EWRAM_DATA s16 sSoundEffectCounter1 = {0}; // R=202DE20 | B=213420C +static EWRAM_DATA s16 sSoundEffectCounter2 = {0}; // R=202DE22 | B=2134210 +static EWRAM_DATA s16 sUnusedCounter = {0}; // Contrary to the variables above, this one is never effectively checked. R=202DE24 | B=2134214 -static EWRAM_DATA u32 gUnknown_202DE1C = {0}; // R=202DE1C | B=2134218 -static EWRAM_DATA s16 gUnknown_202DE20 = {0}; // R=202DE20 | B=213420C -static EWRAM_DATA s16 gUnknown_202DE22 = {0}; // R=202DE22 | B=2134210 -static EWRAM_DATA s16 gUnknown_202DE24 = {0}; // R=202DE24 | B=2134214 - -void sub_801180C(void) +void ResetSoundEffectCounters(void) { - gUnknown_202DE1C = 0; - gUnknown_202DE20 = 0; - gUnknown_202DE22 = 0; - gUnknown_202DE24 = 0; + sUnknownUnused = 0; + sSoundEffectCounter1 = 0; + sSoundEffectCounter2 = 0; + sUnusedCounter = 0; } -void sub_8011830(void) +void StopBGMResetSoundEffectCounters(void) { StopBGMusicVSync(); - gUnknown_202DE20 = 0; - gUnknown_202DE22 = 0; - gUnknown_202DE24 = 0; + sSoundEffectCounter1 = 0; + sSoundEffectCounter2 = 0; + sUnusedCounter = 0; } void StartBGMusic(void) @@ -33,16 +31,16 @@ void StartBGMusic(void) } // arm9.bin::020187C0 -void sub_8011860(void) +void UpdateSoundEffectCounters(void) { - if (gUnknown_202DE20 > 0) - gUnknown_202DE20--; + if (sSoundEffectCounter1 > 0) + sSoundEffectCounter1--; - if (gUnknown_202DE22 > 0) - gUnknown_202DE22--; + if (sSoundEffectCounter2 > 0) + sSoundEffectCounter2--; - if (gUnknown_202DE24 > 0) - gUnknown_202DE24--; + if (sUnusedCounter > 0) + sUnusedCounter--; } void StopAllMusic_1(void) @@ -59,7 +57,7 @@ void FadeOutAllMusic(u16 speed) FadeOutFanfareSE(STOP_SOUND_EFFECT, speed); } -void xxx_call_start_new_bgm(u16 songIndex) +void StartNewBGM_(u16 songIndex) { StartNewBGM(songIndex); } @@ -120,25 +118,27 @@ bool8 IsSoundPlaying(u16 songIndex) return IsFanfareSEPlaying(songIndex); } -void PlayMenuSoundEffect(u32 a0) +static const u16 sMenuSoundEffects[] = {302, 303, 303, 301, 304, 306, 307}; + +void PlayMenuSoundEffect(u32 arrId) { - if (gUnknown_202DE20 > 0) + if (sSoundEffectCounter1 > 0) return; - PlayFanfareSE(gUnknown_80D4144[a0], MAX_VOLUME); - gUnknown_202DE20 = 4; + PlayFanfareSE(sMenuSoundEffects[arrId], MAX_VOLUME); + sSoundEffectCounter1 = 4; } void sub_8011A04(void) { - if (gUnknown_202DE22 > 0) + if (sSoundEffectCounter2 > 0) return; - gUnknown_202DE22 = 3; + sSoundEffectCounter2 = 3; PlayFanfareSE(305, MAX_VOLUME); } UNUSED static void sub_8011A2C(u32 a0) { - gUnknown_202DE1C = a0; + sUnknownUnused = a0; } diff --git a/src/naming_screen.c b/src/naming_screen.c index 45dc3e11d..a7a32e5c5 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "naming_screen.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803D0D8.h" #include "input.h" #include "memory.h" diff --git a/src/options_menu2.c b/src/options_menu2.c index 58a79b3ee..01b8d506a 100644 --- a/src/options_menu2.c +++ b/src/options_menu2.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/colors.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "memory.h" #include "menu_input.h" diff --git a/src/other_menus1.c b/src/other_menus1.c index 19dea01f5..34e3be98c 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -7,7 +7,7 @@ #include "code_800558C.h" #include "graphics_memory.h" #include "code_800C9CC.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "items.h" #include "memory.h" @@ -234,7 +234,7 @@ static void sub_8037400(void) r6 = NULL; r5 = NULL; sub_8037810(); - sub_8011830(); + StopBGMResetSoundEffectCounters(); sUnknown_203B35C->linkStatus = sub_8037B28(sUnknown_203B35C->unk0); if (sUnknown_203B35C->linkStatus == COMMS_GOOD) { switch (sUnknown_203B35C->unk0) { diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 0942f28f1..3c9ca560b 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/dungeon.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" diff --git a/src/pelipper_board.c b/src/pelipper_board.c index b6725d973..3818224c8 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "structs/menu.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_802DE84.h" #include "code_803B050.h" #include "code_80958E8.h" diff --git a/src/personality_test2.c b/src/personality_test2.c index 6a097fcc4..625210cac 100644 --- a/src/personality_test2.c +++ b/src/personality_test2.c @@ -4,7 +4,7 @@ #include "constants/emotions.h" #include "constants/input.h" #include "constants/type.h" -#include "code_80118A4.h" +#include "music_util.h" #include "input.h" #include "memory.h" #include "menu_input.h" diff --git a/src/pokemon_news1.c b/src/pokemon_news1.c index c95c43d8d..2799db4ff 100644 --- a/src/pokemon_news1.c +++ b/src/pokemon_news1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_80958E8.h" #include "input.h" #include "pokemon_mail.h" diff --git a/src/pokemon_news2.c b/src/pokemon_news2.c index af472f38a..b0770797b 100644 --- a/src/pokemon_news2.c +++ b/src/pokemon_news2.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "game_options.h" #include "input.h" #include "memory.h" diff --git a/src/pokemon_news3.c b/src/pokemon_news3.c index b0b8b739a..1d547a5aa 100644 --- a/src/pokemon_news3.c +++ b/src/pokemon_news3.c @@ -4,7 +4,7 @@ #include "constants/mailbox.h" #include "structs/str_802C39C.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803B050.h" #include "code_80958E8.h" #include "input.h" diff --git a/src/post_office_guide2.c b/src/post_office_guide2.c index 953209301..ac15c3e7b 100644 --- a/src/post_office_guide2.c +++ b/src/post_office_guide2.c @@ -3,7 +3,7 @@ #include "constants/mailbox.h" #include "constants/wonder_mail.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8094F88.h" #include "code_80958E8.h" #include "code_80972F4.h" diff --git a/src/save.c b/src/save.c index 23f11a8e4..5d42dbda5 100644 --- a/src/save.c +++ b/src/save.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "string_format.h" #include "code_8097670.h" #include "event_flag.h" @@ -404,7 +404,7 @@ u32 sub_8012240(void) s32 status; struct unk_struct *r5 = MemoryAlloc(sizeof(struct unk_struct), 5); MemoryFill8(r5, 0xFF, 0x4); - sub_8011830(); + StopBGMResetSoundEffectCounters(); status = WriteFlashData(0x1F, (u8 *)r5, sizeof(struct unk_struct)); StartBGMusic(); MemoryFree(r5); diff --git a/src/string_format.c b/src/string_format.c index 783ccbd1b..2bd036f22 100644 --- a/src/string_format.c +++ b/src/string_format.c @@ -3,7 +3,7 @@ #include "constants/input.h" #include "bg_palette_buffer.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "event_flag.h" #include "game_options.h" #include "input.h" @@ -25,7 +25,7 @@ void sub_80140DC(void) pos.x = 200; pos.y = 128; SetSavingIconCoords(&pos); - sub_8011830(); + StopBGMResetSoundEffectCounters(); } void sub_80140F8(void) @@ -35,7 +35,7 @@ void sub_80140F8(void) pos.x = 188; pos.y = 64; SetSavingIconCoords(&pos); - sub_8011830(); + StopBGMResetSoundEffectCounters(); } void sub_8014114(void) { @@ -90,7 +90,6 @@ static const WindowTemplate gUnknown_80D48DC = { extern void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2); extern void sub_80073E0(s32 a0); -extern void sub_8011A04(void); static void sub_8014A88(void); static bool8 sub_8014B94(void); diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 23e314901..cec89bf2e 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/communication_error_codes.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_802F204.h" @@ -1289,7 +1289,7 @@ void UpdateThankYouMailText(void) break; case THANK_YOU_MAIL_COMMS_FINISHED: sUnknown_203B2C4->linkError = COMMS_GOOD; - sub_8011830(); + StopBGMResetSoundEffectCounters(); linkStatus = sub_8037B28(sUnknown_203B2C4->unk40); sUnknown_203B2C4->linkError = linkStatus; if (linkStatus == COMMS_GOOD) diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 0c2cb5327..91f4dab29 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/communication_error_codes.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "cpu.h" @@ -539,7 +539,7 @@ void sub_8036B28(void) sTradeItemsMenu->unk24C = tradeItemZeroed; } - sub_8011830(); + StopBGMResetSoundEffectCounters(); linkStatus = sub_8037B28(sTradeItemsMenu->itemMode); sTradeItemsMenu->linkStatus = linkStatus; if(linkStatus == COMMS_GOOD){ diff --git a/src/wigglytuff_shop1.c b/src/wigglytuff_shop1.c index 755f9575d..45d7a4c36 100644 --- a/src/wigglytuff_shop1.c +++ b/src/wigglytuff_shop1.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/input.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "event_flag.h" #include "friend_area.h" #include "input.h" diff --git a/src/wigglytuff_shop2.c b/src/wigglytuff_shop2.c index aff9e4615..dd17df216 100644 --- a/src/wigglytuff_shop2.c +++ b/src/wigglytuff_shop2.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "common_strings.h" #include "exclusive_pokemon.h" #include "friend_area.h" diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index a5f8cf327..5e545eab6 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8023144.h" #include "code_8099360.h" #include "common_strings.h" diff --git a/src/wonder_mail.c b/src/wonder_mail.c index bbc83afd6..816662a19 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/communication_error_codes.h" -#include "code_80118A4.h" +#include "music_util.h" #include "friend_list.h" #include "code_8024458.h" #include "code_8094F88.h" @@ -508,7 +508,7 @@ void sub_8028348(void) break; case FRIEND_RESCUE_COMMUNICATING: sUnknown_203B2C0->linkError = COMMS_GOOD; - sub_8011830(); + StopBGMResetSoundEffectCounters(); linkError = sub_8037B28(sUnknown_203B2C0->unk40); sUnknown_203B2C0->linkError = linkError; if(linkError == COMMS_GOOD) diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index c207d784b..2379f86f6 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -4,7 +4,7 @@ #include "constants/wonder_mail.h" #include "structs/str_802C39C.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8094F88.h" #include "input.h" #include "items.h" diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index eb403c4f7..edb472e4b 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -4,7 +4,7 @@ #include "constants/wonder_mail.h" #include "structs/str_802C39C.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_8094F88.h" #include "dungeon_info.h" #include "input.h" diff --git a/src/wonder_mail_802C10C.c b/src/wonder_mail_802C10C.c index 3ab84a377..89927c4f7 100644 --- a/src/wonder_mail_802C10C.c +++ b/src/wonder_mail_802C10C.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "constants/input.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803B050.h" #include "code_80958E8.h" #include "input.h" diff --git a/src/wonder_mail_802C4C8.c b/src/wonder_mail_802C4C8.c index cfa857a7e..ddedd5b51 100644 --- a/src/wonder_mail_802C4C8.c +++ b/src/wonder_mail_802C4C8.c @@ -3,7 +3,7 @@ #include "constants/input.h" #include "structs/str_802C39C.h" #include "structs/str_wonder_mail.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803B050.h" #include "code_80958E8.h" #include "input.h" diff --git a/src/wonder_mail_802C860.c b/src/wonder_mail_802C860.c index e3c937afb..312088dea 100644 --- a/src/wonder_mail_802C860.c +++ b/src/wonder_mail_802C860.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_802DE84.h" #include "code_803B050.h" #include "code_80958E8.h" diff --git a/src/wonder_mail_802CDD4.c b/src/wonder_mail_802CDD4.c index d55e2b5c6..4166e777d 100644 --- a/src/wonder_mail_802CDD4.c +++ b/src/wonder_mail_802CDD4.c @@ -4,7 +4,7 @@ #include "structs/str_802C39C.h" #include "structs/str_wonder_mail.h" #include "structs/struct_sub80095e4.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_803B050.h" #include "input.h" #include "memory.h" diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 756137c27..08aa6e9e5 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/communication_error_codes.h" #include "constants/wonder_mail.h" -#include "code_80118A4.h" +#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_803B050.h" @@ -514,7 +514,7 @@ void WonderMailMainMenuCallback(void) break; case 9: gUnknown_203B3E8->wonderMailStatus = COMMS_GOOD; - sub_8011830(); + StopBGMResetSoundEffectCounters(); linkStatus = sub_8037B28(gUnknown_203B3E8->unk24C); gUnknown_203B3E8->wonderMailStatus = linkStatus; if (linkStatus == COMMS_GOOD) { diff --git a/src/world_map.c b/src/world_map.c index dc6acecd5..7665fe396 100644 --- a/src/world_map.c +++ b/src/world_map.c @@ -7,7 +7,7 @@ #include "graphics_memory.h" #include "code_800C9CC.h" #include "code_800D090.h" -#include "code_80118A4.h" +#include "music_util.h" #include "world_map_sound.h" #include "decompress_at.h" #include "decompress_sir.h" @@ -417,7 +417,7 @@ static void WorldMap_RunFrameActions(void) nullsub_24(); DoScheduledMemCopies(); xxx_call_update_bg_sound_input(); - sub_8011860(); + UpdateSoundEffectCounters(); ResetSprites(FALSE); }