Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-06-22 04:20:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move to debug file

Browse Source
This commit is contained in:
DizzyEggg 2025-06-11 18:01:16 +02:00
parent d3597af1b3
commit bcdf4d672f
83 changed files with 185 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
data/data_80CE77C_2.s
View File

@ -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"

21
include/code_80118A4.h
View File

@ -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

24
include/music_util.h Normal file
View File

@ -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

1
ld_script.ld
View File

@ -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);

2
src/adventure_log.c
View File

@ -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"

2
src/code_800DAC0.c
View File

@ -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"

4
src/code_8012A18.c
View File

@ -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();

2
src/code_8015080.c
View File

@ -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"

2
src/code_801AFA4.c
View File

@ -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"

2
src/code_801B3C0.c
View File

@ -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"

2
src/code_801B60C.c
View File

@ -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"

2
src/code_801C8C4.c
View File

@ -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"

2
src/code_801D9E4.c
View File

@ -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"

2
src/code_801EE10.c
View File

@ -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"

2
src/code_801F428.c
View File

@ -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"

2
src/code_801F808.c
View File

@ -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"

2
src/code_80227B8.c
View File

@ -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"

2
src/code_8023144.c
View File

@ -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"

2
src/code_8024458.c
View File

@ -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"

2
src/code_802DE84.c
View File

@ -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"

2
src/code_8031D70.c
View File

@ -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"

2
src/code_806FDF4.c
View File

@ -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"

2
src/code_8072F3C.c
View File

@ -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"

4
src/code_8099360.c
View File

@ -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"

2
src/code_809A560.c
View File

@ -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"

2
src/code_809C5C4.c
View File

@ -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"

46
src/debug.c
View File

@ -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)

2
src/dungeon_music.c
View File

@ -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"

4
src/dungeon_tilemap.c
View File

@ -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[] = {

6
src/dungeon_vram.c
View File

@ -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--;

2
src/felicity_bank.c
View File

@ -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"

2
src/friend_areas_map.c
View File

@ -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"

4
src/friend_areas_map_util.c
View File

@ -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);
}

2
src/friend_list.c
View File

@ -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"

2
src/friend_list_menu.c
View File

@ -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"

6
src/friend_rescue.c
View File

@ -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) {

11
src/ground_main.c
View File

@ -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();

8
src/ground_script.c
View File

@ -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;
}

2
src/gulpin_shop.c
View File

@ -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"

2
src/gulpin_shop_801FB50.c
View File

@ -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"

2
src/hints_menu1.c
View File

@ -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"

2
src/hints_menu2.c
View File

@ -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"

2
src/iq_skill_info_menu.c
View File

@ -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"

2
src/iq_skill_list_menu.c
View File

@ -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"

2
src/iq_skill_menu.c
View File

@ -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"

2
src/kecleon_bros1.c
View File

@ -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"

2
src/kecleon_bros2.c
View File

@ -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"

2
src/kecleon_bros3.c
View File

@ -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"

2
src/kecleon_bros4.c
View File

@ -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"

2
src/luminous_cave.c
View File

@ -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"

2
src/mailbox.c
View File

@ -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"

10
src/main_loops.c
View File

@ -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);

2
src/makuhita_dojo1.c
View File

@ -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"

2
src/makuhita_dojo2.c
View File

@ -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"

2
src/menu_input.c
View File

@ -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"

2
src/mission_reward.c
View File

@ -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"

62
src/music_util.c
View File

@ -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;
}

2
src/naming_screen.c
View File

@ -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"

2
src/options_menu2.c
View File

@ -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"

4
src/other_menus1.c
View File

@ -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) {

2
src/party_list_menu.c
View File

@ -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"

2
src/pelipper_board.c
View File

@ -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"

2
src/personality_test2.c
View File

@ -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"

2
src/pokemon_news1.c
View File

@ -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"

2
src/pokemon_news2.c
View File

@ -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"

2
src/pokemon_news3.c
View File

@ -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"

2
src/post_office_guide2.c
View File

@ -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"

4
src/save.c
View File

@ -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);

7
src/string_format.c
View File

@ -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);

4
src/thank_you_wonder_mail.c
View File

@ -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)

4
src/trade_items_menu.c
View File

@ -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){

2
src/wigglytuff_shop1.c
View File

@ -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"

2
src/wigglytuff_shop2.c
View File

@ -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"

2
src/wigglytuff_shop3.c
View File

@ -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"

4
src/wonder_mail.c
View File

@ -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)

2
src/wonder_mail_4.c
View File

@ -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"

2
src/wonder_mail_5.c
View File

@ -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"

2
src/wonder_mail_802C10C.c
View File

@ -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"

2
src/wonder_mail_802C4C8.c
View File

@ -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"

2
src/wonder_mail_802C860.c
View File

@ -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"

2
src/wonder_mail_802CDD4.c
View File

@ -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"

4
src/wonder_mail_main_menu.c
View File

@ -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) {

4
src/world_map.c
View File

@ -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);
}