diff --git a/include/common.h b/include/common.h index 7b66fcd..2fa32ff 100644 --- a/include/common.h +++ b/include/common.h @@ -112,6 +112,13 @@ typedef struct { /* 0xa8 */ OSMesgQueue field_0xa8; } Unk0; +extern SomethingMusic __MAYBE_SONG_800EB0B0; +extern SomethingMusic __MAYBE_SONG_800EB100; +extern SomethingMusic __MAYBE_SONG_800EB150; +extern SomethingMusic __MAYBE_SONG_800EB1A0; +extern SomethingMusic __MAYBE_SONG_800EB1F0; +extern SomethingMusic __MAYBE_SONG_800EB240; +extern SomethingMusic __MAYBE_SONG_800EB290; extern SomethingMusic* __MAYBE_SONG_ARRAY_800A8218[7]; extern void* musCurrentPtrBank; diff --git a/src/main.c b/src/main.c index 0f8c3c4..666703e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,5 @@ #include "common.h" +#include "libmus.h" INCLUDE_ASM(const s32, "main", func_80070C60); @@ -241,7 +242,26 @@ INCLUDE_ASM(const s32, "main", func_80073C48); INCLUDE_ASM(const s32, "main", func_80073CB0); -INCLUDE_ASM(const s32, "main", func_80073ED8); +extern s32 D_800A81F4; +extern s32 D_800A81F8; +extern s32 D_800C4BCC; + +/* 42D8 80073ED8 */ +void func_80073ED8(void) { + if (D_800A81F4 == 0) { + __MAYBE_SONG_800EB0B0.field_0x2c = 0; + __MAYBE_SONG_800EB100.field_0x2c = 0; + __MAYBE_SONG_800EB150.field_0x2c = 0; + __MAYBE_SONG_800EB1A0.field_0x2c = 0; + __MAYBE_SONG_800EB1F0.field_0x2c = 0; + __MAYBE_SONG_800EB240.field_0x2c = 0; + __MAYBE_SONG_800EB290.field_0x2c = 0; + MusStop(MUSFLAG_SONGS | MUSFLAG_EFFECTS, 12); + D_800A81F4 = 12; + D_800A81F8 = D_800C4BCC; + } +} + INCLUDE_ASM(const s32, "main", func_80073F58);