From 15d15f53b5c5ee095762f141167a0921ed9960be Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Sun, 30 May 2021 23:01:08 -0700 Subject: [PATCH] Moved symbols in unknown_001050 to header file. --- include/unknown_001050.h | 25 +++++++++++++++++++++++++ src/unknown_001050.c | 2 ++ undefined_syms.txt | 15 --------------- 3 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 include/unknown_001050.h diff --git a/include/unknown_001050.h b/include/unknown_001050.h new file mode 100644 index 00000000..87af4f37 --- /dev/null +++ b/include/unknown_001050.h @@ -0,0 +1,25 @@ +#ifndef _UNKNOWN_001050_H_ +#define _UNKNOWN_001050_H_ + +#include "types.h" +#include "audio_internal.h" + +extern ALCSPlayer* gMusicPlayer; +extern ALCSPlayer* gSndFxPlayer; +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_800DC664; +extern s32 D_800DC668; +extern s32 D_800DC66C; +extern u8 D_800DC670; + +#endif \ No newline at end of file diff --git a/src/unknown_001050.c b/src/unknown_001050.c index af6dcb31..28246cc9 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -1,6 +1,8 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80000450 */ +#include "unknown_001050.h" + #include "types.h" #include "macros.h" diff --git a/undefined_syms.txt b/undefined_syms.txt index 0942d052..44c2d8b6 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -67,21 +67,6 @@ D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -gMusicPlayer = 0x800DC630; -gSndFxPlayer = 0x800DC634; -musicRelativeVolume = 0x800DC638; -sfxRelativeVolume = 0x800DC63C; -D_800DC640 = 0x800DC640; -D_800DC644 = 0x800DC644; -D_800DC648 = 0x800DC648; -audioPrevCount = 0x800DC64C; -D_800DC650 = 0x800DC650; -musicVolumeSliderPercentage = 0x800DC654; -D_800DC658 = 0x800DC658; -D_800DC65C = 0x800DC65C; -D_800DC660 = 0x800DC660; -D_800DC66C = 0x800DC66C; -D_800DC670 = 0x800DC670; D_800DC680 = 0x800DC680; D_800DC684 = 0x800DC684; D_800DC688 = 0x800DC688;