pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename MusicPlayer unkFlags to flags

Browse Source
This commit is contained in:
Alex Bates 2020-10-29 01:35:05 +00:00
parent e0c8108543
commit 1a6b1f5fcd
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -307,7 +307,7 @@ typedef struct StaticEntityData {
} StaticEntityData; // size = 0x24 } StaticEntityData; // size = 0x24
typedef struct MusicPlayer { typedef struct MusicPlayer {
/* 0x00 */ u16 unkFlags; /* 0x00 */ u16 flags;
/* 0x02 */ u16 unk_02; /* 0x02 */ u16 unk_02;
/* 0x04 */ s32 fadeOutTime; /* 0x04 */ s32 fadeOutTime;
/* 0x08 */ s32 fadeInTime; /* 0x08 */ s32 fadeInTime;

10
src/code_e0b30_len_b80.c
View File

@ -25,7 +25,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
if (!gameStatus->musicEnabled) { if (!gameStatus->musicEnabled) {
func_800559C4(musicPlayer->unk_18); func_800559C4(musicPlayer->unk_18);
musicPlayer->unkFlags &= ~1; musicPlayer->flags &= ~1;
return 1; return 1;
} else { } else {
@ -37,9 +37,9 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
if (musicPlayer->songID == songID && musicPlayer->variation == variation) { if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
func_8014AC84(volume); // transition volume to? func_8014AC84(volume); // transition volume to?
if (musicPlayer->unkFlags & 4) { if (musicPlayer->flags & 4) {
func_80055B80(musicPlayer->unk_18); func_80055B80(musicPlayer->unk_18);
musicPlayer->unkFlags &= ~4; musicPlayer->flags &= ~4;
} }
return 2; return 2;
@ -50,7 +50,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
musicPlayer->variation = variation; musicPlayer->variation = variation;
musicPlayer->fadeOutTime = unk; musicPlayer->fadeOutTime = unk;
musicPlayer->unk_02 = 1; musicPlayer->unk_02 = 1;
musicPlayer->unkFlags &= ~2; musicPlayer->flags &= ~2;
return 1; return 1;
} }
@ -60,7 +60,7 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 vo
void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) { void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
MusicPlayer* musicPlayers = &gMusicPlayers; MusicPlayer* musicPlayers = &gMusicPlayers;
musicPlayers[playerIndex].unkFlags &= ~8; musicPlayers[playerIndex].flags &= ~8;
_set_music_track(playerIndex, songID, variation, unk, volume); _set_music_track(playerIndex, songID, variation, unk, volume);
} }