diff --git a/splat.yaml b/splat.yaml index 1a9e88f..7a8a980 100644 --- a/splat.yaml +++ b/splat.yaml @@ -446,7 +446,7 @@ segments: - [0x2BF250, bin, "n64_wave_table_00"] # N64 WaveTable - [0x423FF0, bin, "n64_ptr_tables_v2_01"] - [0x429CD0, bin, "n64_wave_table_01"] - - [0x4E3140, bin] + - [0x4E3140, bin, "n64_wave_data"] - [0x4F0FB0, bin] diff --git a/src/overlays/overlay0/3F1B0.c b/src/overlays/overlay0/3F1B0.c index dd1e36d..73aa9ae 100644 --- a/src/overlays/overlay0/3F1B0.c +++ b/src/overlays/overlay0/3F1B0.c @@ -4,38 +4,43 @@ void func_800EA488(void*); -INCLUDE_ASM(const s32, "overlays/overlay0/3F1B0", func_800E9C20); +// INCLUDE_ASM(const s32, "overlays/overlay0/3F1B0", func_800E9C20); -// extern void romCopy(const void* src, const void* dst, const s32 len); -// extern void __something_music(void* arg0, void* arg1); -// extern void func_80081F7C(void* arg); -// extern void MusFxBankSetPtrBank(void*, void*); -// extern u32 D_2B8BA0; -// extern u32 D_2BF250; -// extern u32 D_2BF250_other; -// extern u32 D_423FF0; -// extern u32 D_429CD0; -// extern u32 D_429CD0_other; -// extern u32 D_4E3140; -// extern u32 D_4F0FB0; -// extern u32 D_80104710; -// extern u32 D_8010A760; -// extern u32 D_80164770; +extern void romCopy(const void* src, const void* dst, const s32 len); +extern void __something_music(const void* arg0, const void* arg1); +extern void func_80081F7C(const void* arg); +extern void MusFxBankSetPtrBank(const void*, const void*); -// void func_800E9C20(void) -// { -// romCopy(&D_2B8BA0, &D_80164770, (u32)&D_2BF250 - (u32)&D_2B8BA0); -// romCopy(&D_423FF0, &D_80104710, (u32)&D_429CD0 - (u32)&D_423FF0); -// romCopy(&D_4E3140, &D_8010A760, (u32)&D_4F0FB0 - (u32)&D_4E3140); +extern const u8 n64_ptr_tables_v2_00_ROM_START; +extern const u8 n64_ptr_tables_v2_00_ROM_END; + +extern const u8 n64_ptr_tables_v2_01_ROM_START; +extern const u8 n64_ptr_tables_v2_01_ROM_END; + +extern const u8 n64_wave_data_ROM_START; +extern const u8 n64_wave_data_ROM_END; + +extern const u8 n64_wave_table_00_ROM_START; +extern const u8 n64_wave_table_01_ROM_START; + +extern const u8 D_8010A760; +extern const u8 D_80164770; +extern const u8 D_80104710; + +void func_800E9C20(void) +{ + romCopy(&n64_ptr_tables_v2_00_ROM_START, &D_80164770, &n64_ptr_tables_v2_00_ROM_END - &n64_ptr_tables_v2_00_ROM_START); + romCopy(&n64_ptr_tables_v2_01_ROM_START, &D_80104710, &n64_ptr_tables_v2_01_ROM_END - &n64_ptr_tables_v2_01_ROM_START); + romCopy(&n64_wave_data_ROM_START, &D_8010A760, &n64_wave_data_ROM_END - &n64_wave_data_ROM_START); -// __something_music(&D_80164770, &D_2BF250_other); -// __something_music(&D_80104710, &D_429CD0_other); + __something_music(&D_80164770, &n64_wave_table_00_ROM_START); + __something_music(&D_80104710, &n64_wave_table_01_ROM_START); -// func_80081F7C(&D_8010A760); + func_80081F7C(&D_8010A760); -// MusFxBankSetPtrBank(&D_8010A760, &D_80104710); -// } + MusFxBankSetPtrBank(&D_8010A760, &D_80104710); +} INCLUDE_ASM(const s32, "overlays/overlay0/3F1B0", func_800E9CEC); @@ -121,9 +126,7 @@ INCLUDE_ASM(const s32, "overlays/overlay0/3F1B0", func_800EA488); // INCLUDE_ASM(const s32, "overlays/overlay0/3F1B0", func_800EA568); extern s32 func_80081770(s32); -extern void func_80081DF0(u8*); - -extern u8 D_80104710; +extern void func_80081DF0(const void*); void func_800EA568(Arg* arg0) { diff --git a/undefined_funcs.txt b/undefined_funcs.txt index 0549b34..32d0f2b 100644 --- a/undefined_funcs.txt +++ b/undefined_funcs.txt @@ -104,4 +104,6 @@ func_80243510 = 0x80243510; func_80243600 = 0x80243600; func_8024366C = 0x8024366C; func_802439E0 = 0x802439E0; -func_80243B94 = 0x80243B94; \ No newline at end of file +func_80243B94 = 0x80243B94; + +func_80081F7C = 0x80081F7C; \ No newline at end of file