diff --git a/data/dkr.data.s b/data/dkr.data.s index 8e548f83..2b038995 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -6,55 +6,57 @@ .balign 4 .endm -glabel gMusicPlayer -.word 0x00000000 +############## unknown_001050.c (.data) ############## -glabel gSndFxPlayer -.word 0x00000000 +# glabel gMusicPlayer +# .word 0x00000000 +# +# glabel gSndFxPlayer +# .word 0x00000000 +# +# glabel musicRelativeVolume +# .word 0x7F000000 +# +# glabel sfxRelativeVolume +# .word 0x7F000000 +# +# glabel D_800DC640 +# .word 0x01000000 +# +# glabel D_800DC644 +# .word 0x00000000 +# +# glabel D_800DC648 +# .word 0x00000000 +# +# glabel audioPrevCount +# .word 0x00000000 +# +# glabel D_800DC650 +# .word 0x3F800000 +# +# glabel musicVolumeSliderPercentage +# .word 0x00000100 +# +# glabel D_800DC658 +# .word 0x00000000 +# +# glabel D_800DC65C +# .word 0x00000000 +# +# glabel D_800DC660 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# glabel D_800DC66C +# .word 0x00000100 + +# glabel D_800DC670 +# .word 0x00000000 -glabel musicRelativeVolume -.word 0x7F000000 +# .word 0, 0, 0 # File Padding? -glabel sfxRelativeVolume -.word 0x7F000000 - -glabel D_800DC640 -.word 0x01000000 - -glabel D_800DC644 -.word 0x00000000 - -glabel D_800DC648 -.word 0x00000000 - -glabel audioPrevCount -.word 0x00000000 - -glabel D_800DC650 -.word 0x3F800000 - -glabel musicVolumeSliderPercentage -.word 0x00000100 - -glabel D_800DC658 -.word 0x00000000 - -glabel D_800DC65C -.word 0x00000000 - -glabel D_800DC660 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 - -glabel D_800DC66C -.word 0x00000100 - -glabel D_800DC670 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +###################################################### glabel D_800DC680 .word 0x00000000 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 592c56d0..47223c40 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -14,27 +14,38 @@ typedef struct unk80115D48 { /* 0x04 */ s32 unk4; } unk80115D48; -extern ALCSPlayer* gMusicPlayer; -extern ALCSPlayer* gSndFxPlayer; +/************ .data ************/ -extern u8 musicRelativeVolume; -extern u8 sfxRelativeVolume; -extern u8 D_800DC640; -extern u8 D_800DC644; -extern s32 D_800DC648; -extern s32 audioPrevCount; -extern f32 D_800DC650; -extern s32 musicVolumeSliderPercentage; -extern s32 D_800DC658; -extern u8 D_800DC65C; -extern u8 D_800DC660; -extern s32 D_800DC66C; -extern u8 D_800DC670; +ALCSPlayer* gMusicPlayer = NULL; +ALCSPlayer* gSndFxPlayer = NULL; +u8 musicRelativeVolume = 0x7F; +u8 sfxRelativeVolume = 0x7F; +u8 D_800DC640 = 1; +u8 D_800DC644 = 0; +s32 D_800DC648 = 0; +s32 audioPrevCount = 0; +f32 D_800DC650 = 1.0; +s32 musicVolumeSliderPercentage = 0x100; +s32 D_800DC658 = 0; +u8 D_800DC65C = 0; +u8 D_800DC660 = 0; +s32 D_800DC664 = 0; // Currently unknown, might be a different type. +s32 D_800DC668 = 0; // Currently unknown, might be a different type. +s32 D_800DC66C = 0x100; +u8 D_800DC670 = 0; + +/*******************************/ + +/************ .rodata ************/ extern f32 D_800E49DC; extern f32 D_800E49EC; - extern u8 D_800EBF60; + +/*********************************/ + +/************ .bss ************/ + extern ALHeap gALHeap; /* Unknown size */ @@ -90,7 +101,7 @@ extern s32 D_80115F7C; extern u32 D_80115F84; extern u32 D_80115F88; - +/******************************/ typedef struct audioMgrConfig_s{ u32 unk00; diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 4b681016..396a7e9b 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -75,6 +75,7 @@ class GenerateLD: def gen_data_section(self): self.gen_line('.main_data 0x80000400 : AT(romPos) SUBALIGN(16)') self.gen_open_block() + self.gen_line(BUILD_DIR + '/src/unknown_001050.o(.data);') self.gen_line(BUILD_DIR + '/data/dkr.data.o(.data);') self.gen_close_block() self.gen_line('romPos += SIZEOF(.main_data);')