Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-29 12:27:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

document Fanfare/SoundEffect funcs

Browse Source
This commit is contained in:
Seth Barberee
2022-06-12 07:46:47 -07:00
parent b6bafe4527
commit b0217dd778
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/music.h
View File

@@ -6,8 +6,8 @@ void StartBGMusicVSync(void);
u8 sub_800CA38(u32 songIndex);
void StartNewBGM(u16 songIndex);
bool8 IsBGSong(u32 songIndex);
bool8 sub_800CAAC(u32 songIndex);
bool8 sub_800CACC(u32 songIndex);
bool8 IsSoundEffect(u32 songIndex);
bool8 IsFanfare(u32 songIndex);
u16 GetMusicPlayerIndex(u16 songIndex);
bool8 sub_800CAF0(u16 songIndex);
void StartNewBGM(u16 songIndex);

8
src/music.c
View File

@@ -107,14 +107,14 @@ u8 sub_800CA38(u32 songIndex)
return 1;
}
}
if(sub_800CACC(songIndex))
if(IsFanfare(songIndex))
{
if(GetMusicPlayerIndex(songIndex) == 1)
{
return 1;
}
}
else if(sub_800CAAC(songIndex))
else if(IsSoundEffect(songIndex))
{
if(GetMusicPlayerIndex(songIndex) > 1)
{
@@ -137,7 +137,7 @@ bool8 IsBGSong(u32 songIndex)
return FALSE;
}
bool8 sub_800CAAC(u32 songIndex)
bool8 IsSoundEffect(u32 songIndex)
{
if(songIndex - 300 <= 639)
{
@@ -146,7 +146,7 @@ bool8 sub_800CAAC(u32 songIndex)
return FALSE;
}
bool8 sub_800CACC(u32 songIndex)
bool8 IsFanfare(u32 songIndex)
{
if(songIndex - 200 <= 19)
{

20
src/music_pre.c
View File

@@ -58,7 +58,7 @@ struct unkStruct_3000FD8
};
extern struct unkStruct_3000FD8 gUnknown_3000FD8[8];
extern struct unkStruct_3000FD8 gUnknown_3000FE8[4];
extern struct unkStruct_3000FD8 gUnknown_3000FE8[8];
extern u8 gUnknown_202D7FE;
extern u16 gBldCnt;
@@ -595,7 +595,7 @@ void sub_800C074(u16 SongIndex, u16 param_2)
if (param_2 > 256)
param_2 = 256;
if (sub_800CACC(SongIndex))
if (IsFanfare(SongIndex))
{
if (GetMusicPlayerIndex(SongIndex) == 1) {
interrupt_flag = DisableInterrupts();
@@ -668,7 +668,7 @@ void sub_800C074(u16 SongIndex, u16 param_2)
}
else
{
if (!sub_800CAAC(SongIndex))
if (!IsSoundEffect(SongIndex))
return;
msVar = GetMusicPlayerIndex(SongIndex);
preload = &gUnknown_3000FD8[msVar]; // need to load this before comparison to match
@@ -706,7 +706,7 @@ void sub_800C214(u16 songIndex, u16 volume)
volume = 256;
}
if ((!sub_800CACC(songIndex)) && (sub_800CAAC(songIndex))) {
if ((!IsFanfare(songIndex)) && (IsSoundEffect(songIndex))) {
msVar = GetMusicPlayerIndex(songIndex);
info = gMPlayTable[msVar].info;
preload = &gUnknown_3000FD8[msVar];
@@ -750,7 +750,7 @@ void sub_800C298(u16 songIndex)
EnableInterrupts();
}
}
else if (sub_800CAAC(songIndex))
else if (IsSoundEffect(songIndex))
{
uVar2 = GetMusicPlayerIndex(songIndex);
puVar6 = gMPlayTable[uVar2].info;
@@ -785,7 +785,7 @@ void sub_800C298(u16 songIndex)
EnableInterrupts();
}
}
else if (sub_800CACC(songIndex))
else if (IsFanfare(songIndex))
{
cVar4 = DisableInterrupts();
if (gUnknown_202D690 != 0) {
@@ -848,7 +848,7 @@ void sub_800C3F8(u16 songIndex, u16 speed)
}
}
else {
if (sub_800CAAC(songIndex)) {
if (IsSoundEffect(songIndex)) {
uVar8 = GetMusicPlayerIndex(songIndex);
preload = &gUnknown_3000FD8[uVar8];
puVar5 = gMPlayTable[uVar8].info;
@@ -884,7 +884,7 @@ void sub_800C3F8(u16 songIndex, u16 speed)
EnableInterrupts();
}
}
else if (sub_800CACC(songIndex)) {
else if (IsFanfare(songIndex)) {
cVar4 = DisableInterrupts();
if ((gUnknown_202D690 != 0) && (gUnknown_202D68E == songIndex)) {
if (sub_800CAF0(1) != '\0') {
@@ -913,14 +913,14 @@ bool8 sub_800C5D0(u16 songIndex)
songIndex_u32_2 = songIndex_u32;
if (sub_800CACC(songIndex_u32)) {
if (IsFanfare(songIndex_u32)) {
if ((gUnknown_202D690 != 0) && (gUnknown_202D68E == songIndex_u32)) {
return TRUE;
}
}
else
{
if (sub_800CAAC(songIndex_u32)) {
if (IsSoundEffect(songIndex_u32)) {
uVar3 = GetMusicPlayerIndex(songIndex_u32);
preload = &gUnknown_3000FD8[uVar3];
if ((1 < uVar3) && (preload->songIndex == songIndex_u32_2)) {