diff --git a/include/common.h b/include/common.h index 1a5809d..19ab19b 100644 --- a/include/common.h +++ b/include/common.h @@ -93,7 +93,7 @@ typedef struct { /* 0x20 */ s32 field_0x20; /* 0x24 */ unsigned long handle; /* 0x28 */ s32 field_0x28; - /* 0x2C */ s32 field_0x2c; + /* 0x2C */ s32 index; /* 0x30 */ s32 field_0x30; /* 0x34 */ s32 field_0x34; /* 0x38 */ s32 field_0x38; diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 183c92e..13c4e3d 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -980,6 +980,7 @@ __read_u32_le = 0x8007A7E0; __load_song = 0x800EA488; // rom:0x3FA18 __SONG_VOLUME = 0x800EB2E0; +__SONG_REVERB = 0x800EB2E4; __SONG_SOURCE_START = 0x800EB4F0; __SONG_SOURCE_END = 0x800EB4F4; diff --git a/src/main.c b/src/main.c index f9c03c5..b9e404a 100644 --- a/src/main.c +++ b/src/main.c @@ -456,13 +456,13 @@ INCLUDE_ASM(const s32, "main", func_80073CB0); /* 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; + __MAYBE_SONG_800EB0B0.index = 0; + __MAYBE_SONG_800EB100.index = 0; + __MAYBE_SONG_800EB150.index = 0; + __MAYBE_SONG_800EB1A0.index = 0; + __MAYBE_SONG_800EB1F0.index = 0; + __MAYBE_SONG_800EB240.index = 0; + __MAYBE_SONG_800EB290.index = 0; MusStop(MUSFLAG_SONGS | MUSFLAG_EFFECTS, 12); D_800A81F4 = 12; D_800A81F8 = nuScRetraceCounter; @@ -478,7 +478,7 @@ void __initialize_song_mem(void) { mask = osSetIntMask(OS_IM_NONE); for(count = 0; count < 7; count++) { - __MAYBE_SONG_ARRAY_800A8218[count]->field_0x2c = 0; + __MAYBE_SONG_ARRAY_800A8218[count]->index = 0; __MAYBE_SONG_ARRAY_800A8218[count]->field_0x30 = 0; __MAYBE_SONG_ARRAY_800A8218[count]->field_0x34 = 0; __MAYBE_SONG_ARRAY_800A8218[count]->field_0x38 = 0; diff --git a/src/segment_song/_ob_knotty_chess.c b/src/segment_song/_ob_knotty_chess.c index fc6fca2..01b5b73 100644 --- a/src/segment_song/_ob_knotty_chess.c +++ b/src/segment_song/_ob_knotty_chess.c @@ -47,7 +47,7 @@ void func_800EA3BC(SomethingMusic* arg0) { arg0->field_0x8 = 0; arg0->field_0xc = 0; - arg0->field_0x2c = temp_v0; + arg0->index = temp_v0; arg0->field_0x30 = temp_v1; arg0->field_0x34 = temp_a1; } @@ -71,10 +71,10 @@ void func_800EA3E4(SomethingMusic* arg0) { arg0->field_0x3c = 3; } arg0->field_0x38 = 2; - arg0->field_0x40 = arg0->field_0x2c; + arg0->field_0x40 = arg0->index; return; } - arg0->field_0x40 = arg0->field_0x2c; + arg0->field_0x40 = arg0->index; } INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", __load_song); @@ -94,8 +94,8 @@ void func_800EA568(SomethingMusic* arg0) { arg0->field_0x28 = arg0->handle; MusPtrBankSetSingle(&D_80104710); - arg0->handle = MusStartEffect(arg0->field_0x2c - 1); - arg0->field_0x20 = arg0->field_0x2c; + arg0->handle = MusStartEffect(arg0->index - 1); + arg0->field_0x20 = arg0->index; } INCLUDE_ASM(const s32, "segment_song/_ob_knotty_chess", func_800EA604);