Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-18 16:53:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Seth Barberee 2022-06-25 09:07:33 -07:00
parent 6746cb699a
commit 015b63fef2
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/music.s
View File

@ -163,7 +163,7 @@ _0800C774:
_0800C794: .4byte gCurrentBGSong
_0800C798: .4byte 0x000003e7
_0800C79C: .4byte gBGMusicPlayerState
_0800C7A0: .4byte gUnknown_202D694
_0800C7A0: .4byte gRestartBGM
_0800C7A4:
ldr r0, _0800C7B0
movs r1, 0x4

2
src/code_8057824_1.c
View File

@ -3721,7 +3721,7 @@ void JirachiWish(void)
s32 temp3;
JirachiEntity = GetEntityFromClientType(0x1a);
CopySpeciesNametoBuffer(gUnknown_202E038,0x19d); // SPECIES_JIRACHI
CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_JIRACHI);
sub_80855E4(sub_808BBA8);
sub_808BBA8(JirachiEntity);
sub_8041888(0);

8
src/music.c
View File

@ -23,7 +23,7 @@ extern u16 gBGMusicPlayerState;
extern u16 gCurrentBGSong;
extern u16 gUnknown_202D690;
extern u8 gUnknown_202D694;
extern u8 gRestartBGM;
extern u32 gUnknown_203B0B8;
extern u16 gRawKeyInput;
@ -45,11 +45,11 @@ void StopBGMusicVSync(void)
{
if(gBGMusicPlayerState == 2)
{
gUnknown_202D694 = 0;
gRestartBGM = FALSE;
}
else if(gBGMusicPlayerState == BG_PLAYER_STATE_PLAYING)
{
gUnknown_202D694 = 1;
gRestartBGM = TRUE;
}
gBGMusicPlayerState = BG_PLAYER_STATE_STOPPED;
}
@ -74,7 +74,7 @@ void StartBGMusicVSync(void)
if(gBGMusicPlayerState == BG_PLAYER_STATE_STOPPED)
{
gBGMusicPlayerState = BG_PLAYER_STATE_PLAYING;
if(gUnknown_202D694 != 0)
if(gRestartBGM)
{
m4aSongNumStart(gCurrentBGSong);
}

12
src/music_pre.c
View File

@ -37,7 +37,7 @@ extern u16 gUnknown_202D68C;
extern u16 gCurrentFanfareSong;
extern u16 gUnknown_202D690;
extern u16 gUnknown_202D692;
extern u8 gUnknown_202D694;
extern bool8 gRestartBGM;
extern u8 gUnknown_203B099;
extern u8 gUnknown_203B09B;
extern u32 gUnknown_203B09C;
@ -412,7 +412,7 @@ void InitMusic(void)
gCurrentFanfareSong = 997;
gUnknown_202D690 = 0;
gUnknown_202D692 = 0;
gUnknown_202D694 = 0;
gRestartBGM = FALSE;
for(playerIndex = INDEX_BGM, musicPlayer = &gUnknown_3000FD8[0]; playerIndex < INDEX_SE6 + 1; playerIndex++, musicPlayer++)
{
@ -451,7 +451,7 @@ void StartNewBGM(u16 songIndex)
}
interrupt_flag = DisableInterrupts();
gCurrentBGSong = songIndex;
gUnknown_202D694 = 1;
gRestartBGM = TRUE;
if(gUnknown_202D690 == 0)
{
@ -491,7 +491,7 @@ void FadeInNewBGM(u16 songIndex, u16 speed)
interrupt_flag = DisableInterrupts();
gCurrentBGSong = songIndex;
gUnknown_202D694 = 1;
gRestartBGM = TRUE;
if(gUnknown_202D690 == 0)
{
@ -609,7 +609,7 @@ void PlayFanfareSE(u16 songIndex, u16 param_2)
{
gUnknown_202D690 = 1;
gUnknown_202D692 = 16;
gUnknown_202D694 = 0;
gRestartBGM = FALSE;
m4aMPlayFadeOutTemporarily(&gMPlayInfo_BGM, 1);
}
else if (gBGMusicPlayerState == 3)
@ -654,7 +654,7 @@ void PlayFanfareSE(u16 songIndex, u16 param_2)
case MUS_FRIEND_AREA_ENCLOSED_ISLAND:
case MUS_FRIEND_AREA_FINAL_ISLAND:
case MUS_FRIEND_AREA_HEALING_FOREST:
gUnknown_202D694 = 1;
gRestartBGM = TRUE;
break;
default:
break;

2
sym_ewram.txt
View File

@ -329,7 +329,7 @@ gUnknown_202D690 = .; /* 202D690 */
gUnknown_202D692 = .; /* 202D692 */
. += 0x2;
gUnknown_202D694 = .; /* 202D694 */
gRestartBGM = .; /* 202D694 */
. += 0x4;
gBG0Control = .; /* 202D698 */