diff --git a/asm/music.s b/asm/music.s index 929d0600c..edb7f8525 100644 --- a/asm/music.s +++ b/asm/music.s @@ -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 diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index 3fb4a3176..76da08096 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -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); diff --git a/src/music.c b/src/music.c index 9fda55f72..a570d5ba1 100644 --- a/src/music.c +++ b/src/music.c @@ -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); } diff --git a/src/music_pre.c b/src/music_pre.c index 0eb09d33e..2c0fcb125 100644 --- a/src/music_pre.c +++ b/src/music_pre.c @@ -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; diff --git a/sym_ewram.txt b/sym_ewram.txt index fe49cf47a..bde480c5f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -329,7 +329,7 @@ gUnknown_202D690 = .; /* 202D690 */ gUnknown_202D692 = .; /* 202D692 */ . += 0x2; -gUnknown_202D694 = .; /* 202D694 */ +gRestartBGM = .; /* 202D694 */ . += 0x4; gBG0Control = .; /* 202D698 */