diff options
| author | zelda2774 <69368340+zelda2774@users.noreply.github.com> | 2021-08-12 21:37:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 15:37:37 -0400 |
| commit | a0d2cceeca7e655010b0ec0589c09803104e8192 (patch) | |
| tree | 4174eb8bf1d9c12b7010f1d2de1eb9cb3831b920 /src/code/code_800F7260.c | |
| parent | 1b1487a50466340c8b75ec21a31d4ce71055f034 (diff) | |
Match some audio functions (#896)
* cleanups
* Improve Audio_SequencePlayerProcessSequence
* cleanup
* labeling
* progress on func_800E5000
* func_800F6268
* func_800ECDF8
* Improve func_800F2464
* reorder variables
* labelling
* non-equivalent func_800EEA50
* minor doc
* func_800E6590
* minor doc
* Reformat abi.h
* Very slight improvements
* func_800DC384
* func_800E1618
* formatting
Co-authored-by: zelda2774 <zelda2774@invalid>
Diffstat (limited to 'src/code/code_800F7260.c')
| -rw-r--r-- | src/code/code_800F7260.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index aed3f4cb8..db3180fb1 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -18,27 +18,20 @@ typedef struct { /* 0x0C */ u16 unk_C; } Struct_800F8EA0; // size = 0x10 -u8 D_80133340[4] = { - 0x53, - 0x45, - 0x00, - 0x00, -}; +// rodata for func_800F7680 (this file) +char D_80133340[] = "SE"; +// rodata for func_800F7CEC (this file) char D_80133344[] = VT_COL(RED, WHITE) "<INAGAKI CHECK> dist over! flag:%04X ptr:%08X pos:%f-%f-%f" VT_RST "\n"; +// file padding s32 D_8013338C = 0; -UNK_TYPE D_80133390[] = { - 0x53455120, - 0x48000000, -}; - -UNK_TYPE D_80133398[] = { - 0x20202020, - 0x4C000000, -}; +// rodata for Audio_ProcessSeqCmd (code_800F9280.c) +char D_80133390[] = "SEQ H"; +char D_80133398[] = " L"; +// data u8 D_801333A0 = 0; u8 D_801333A4 = 0; @@ -114,6 +107,8 @@ void Audio_ClearBGMMute(u8 arg0) { } } +// a3 = freq scale factor for ocarina +// a5 = reverb add void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u8 a2, f32* a3, f32* a4, s8* a5) { u8 i; Struct_800F738C* phi_v0; @@ -559,7 +554,7 @@ void func_800F87A0(u8 bankId) { } bankIndex = gSoundBanks[bankId][0].next; } - sp48.unk_28 = bankId << 0xC; + sp48.unk_28 = bankId << 12; func_800F74E0(0, &sp48); } @@ -588,7 +583,7 @@ void func_800F89A0(u8 bankId, Vec3f* pos) { SoundBankEntry sp18; func_800F8884(bankId, pos); - sp18.unk_28 = bankId << 0xC; + sp18.unk_28 = bankId << 12; sp18.posX = &pos->x; func_800F74E0(1, &sp18); } |