diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-26 09:09:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-26 09:09:16 -0400 |
| commit | c7a27c188361ac6cb261b3e86792560d4b295483 (patch) | |
| tree | 670f27a5166c099ef8f7454a256270bf94662fb1 /arm9/src | |
| parent | 42afbf282d1995ec1970370abd200d7eb6baf8a7 (diff) | |
| parent | 981bf953cbf711eca70d31ccec297ac38501ffd8 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/main.c | 3 | ||||
| -rw-r--r-- | arm9/src/sound.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index ec3c358c..874ea224 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -47,7 +47,6 @@ extern void FUN_02015E60(void); extern void FUN_020222C4(void); extern void FUN_0200A318(void); extern void FUN_0200E2D8(void); -extern void FUN_02003C10(void); extern struct Unk21DBE18 MOD63_UNK_021DBE18; extern struct Unk21DBE18 MOD52_021D76C8; @@ -137,7 +136,7 @@ THUMB_FUNC void NitroMain(void) FUN_0200E2D8(); if (gUnknown21C48B8.unk0) gUnknown21C48B8.unk0(gUnknown21C48B8.unk4); - FUN_02003C10(); + DoSoundUpdateFrame(); FUN_0201B5CC(gUnknown21C48B8.unk20); } } diff --git a/arm9/src/sound.c b/arm9/src/sound.c index 7fba715c..d971872f 100644 --- a/arm9/src/sound.c +++ b/arm9/src/sound.c @@ -41,7 +41,7 @@ void InitSoundData(u32 a0, struct Options * a1) FUN_02004D60(a1->unk0_4); } -void FUN_02003C10(void) +void DoSoundUpdateFrame(void) { struct SoundData * sdat = GetSoundDataPointer(); if (!FUN_02003D04()) |