summaryrefslogtreecommitdiff
path: root/src/music_pre.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-02-07 19:10:12 -0800
committerGitHub <noreply@github.com>2021-02-07 21:10:12 -0600
commit8dfd044ef3a6ea8da204265b4560716aa67391d1 (patch)
tree15274fab1fd9b1d4e477bbfddbfb855ade1eabeb /src/music_pre.c
parent74daf03fd70e7c71b92390c9133c9dd543bcb28d (diff)
Some Personality and data (#26)
* decomp few personality funcs and clean up some pointers in the dungeon data * de-pointer-ify friend area dialogue * clean pointers on a personality test question * decomp a few more main menu funcs and dump some more data * label some funcs
Diffstat (limited to 'src/music_pre.c')
-rw-r--r--src/music_pre.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/music_pre.c b/src/music_pre.c
index 5c0589a..bd87aac 100644
--- a/src/music_pre.c
+++ b/src/music_pre.c
@@ -454,6 +454,7 @@ u16 GetCurrentBGSong(void)
}
#ifdef NONMATCHING
+// TODO fix reg allocation.. using one too many regs
void sub_800C074(u16 SongIndex,u16 param_2)
{
bool8 interrupt_flag;
@@ -548,10 +549,15 @@ void sub_800C074(u16 SongIndex,u16 param_2)
m4aSongNumStart(SongIndex);
preload->unk0 = 1;
preload->songIndex = SongIndex;
- // TODO fix this comparison
- // Generates eor/neg/lsr
- preload->unk6 = param_2 != 0x100;
- preload->unk4 = param_2;
+ if(msVar == param_2)
+ {
+ preload->unk6 = 1;
+ }
+ else
+ {
+ preload->unk6 = 0;
+ }
+ preload->unk4 = msVar;
if (interrupt_flag)
EnableInterrupts();
}