Archive/Starship
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-04-28 12:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Decomp audio_load. Add names for audio context fields and audio_heap (#143)

Browse source 
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup
This commit is contained in:
petrie911 2024-02-23 19:56:08 -06:00 • committed by GitHub
parent 647f0f5d2e
commit e7fbb38c98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
57 changed files with 3379 additions and 1748 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/buffers.h
View file

@ -7,7 +7,7 @@ extern u64 gDramStack[];
extern u8 gOSYieldData[]; extern u8 gOSYieldData[];
extern FrameBuffer gZBuffer; // z buffer extern FrameBuffer gZBuffer; // z buffer
extern u8 gTaskOutputBuffer[]; extern u8 gTaskOutputBuffer[];
extern u8 gAudioDataBuffer[]; extern u8 gAudioHeap[];
extern u16 gTextureRenderBuffer[]; extern u16 gTextureRenderBuffer[];
extern u16 gFillBuffer[]; extern u16 gFillBuffer[];
extern FrameBuffer gFrameBuffers[]; // 8038F800 extern FrameBuffer gFrameBuffers[]; // 8038F800

2
include/functions.h
View file

@ -8,7 +8,7 @@
#include "sf64mesg.h" #include "sf64mesg.h"
// audio // audio
void func_8000FFCC(void); void AudioLoad_Init(void);
void func_80016A50(void); void func_80016A50(void);
void func_800182F4(s32); void func_800182F4(s32);

573
include/sf64audio_provisional.h
View file

@ -165,10 +165,10 @@ typedef struct NotePool {
// doesn't prevent seqplayer from doing it, AFAICT. // doesn't prevent seqplayer from doing it, AFAICT.
typedef struct { typedef struct {
/* 0x00 */ u8 mode; // bit 0x80 denotes something; the rest are an index 0-5 /* 0x00 */ u8 mode; // bit 0x80 denotes something; the rest are an index 0-5
/* 0x02 */ u16 cur; /* 0x04 */ f32 cur;
/* 0x04 */ u16 speed; /* 0x08 */ f32 speed;
/* 0x08 */ f32 extent; /* 0x0C */ f32 extent;
} Portamento; // size = 0xC } Portamento; // size = 0x10
typedef struct { typedef struct {
/* 0x0 */ s16 delay; /* 0x0 */ s16 delay;
@ -239,8 +239,8 @@ typedef struct {
/* 0x01 */ u8 numDrums; /* 0x01 */ u8 numDrums;
/* 0x02 */ u8 sampleBankId1; /* 0x02 */ u8 sampleBankId1;
/* 0x03 */ u8 sampleBankId2; /* 0x03 */ u8 sampleBankId2;
/* 0x08 */ Instrument** instruments; /* 0x04 */ Instrument** instruments;
/* 0x0C */ Drum** drums; /* 0x08 */ Drum** drums;
} SoundFont; // size = 0x10 } SoundFont; // size = 0x10
typedef struct { typedef struct {
@ -317,7 +317,7 @@ typedef struct {
/* 0x028 */ f32 muteVolumeScale; /* 0x028 */ f32 muteVolumeScale;
/* 0x02C */ f32 fadeVolumeScale; /* 0x02C */ f32 fadeVolumeScale;
/* 0x030 */ f32 appliedFadeVolume; /* 0x030 */ f32 appliedFadeVolume;
/* 0x034 */ f32 bend; // /* 0x034 */ f32 bend;
/* 0x038 */ struct SequenceChannel* channels[16]; /* 0x038 */ struct SequenceChannel* channels[16];
/* 0x078 */ SeqScriptState scriptState; /* 0x078 */ SeqScriptState scriptState;
/* 0x094 */ u8* shortNoteVelocityTable; /* 0x094 */ u8* shortNoteVelocityTable;
@ -326,8 +326,8 @@ typedef struct {
/* 0x0DC */ s32 skipTicks; /* 0x0DC */ s32 skipTicks;
/* 0x0E0 */ u32 scriptCounter; /* 0x0E0 */ u32 scriptCounter;
/* 0x0E4 */ char /* 0x0E4 */ char
padE4[0x68]; // unused struct members for sequence/sound font dma management, according to sm64 decomp padE4[0x6C]; // unused struct members for sequence/sound font dma management, according to sm64 decomp
} SequencePlayer; // size = 0x160 } SequencePlayer; // size = 0x14C
typedef struct { typedef struct {
/* 0x0 */ u8 decayIndex; // index used to obtain adsr decay rate from adsrDecayTable /* 0x0 */ u8 decayIndex; // index used to obtain adsr decay rate from adsrDecayTable
@ -376,9 +376,8 @@ typedef struct {
/* 0x01 */ u8 gain; // Increases volume by a multiplicative scaling factor. Represented as a UQ4.4 number /* 0x01 */ u8 gain; // Increases volume by a multiplicative scaling factor. Represented as a UQ4.4 number
/* 0x02 */ u8 pan; /* 0x02 */ u8 pan;
/* 0x03 */ Stereo stereo; /* 0x03 */ Stereo stereo;
/* 0x04 */ u8 combFilterSize; /* 0x04 */ f32 freqScale;
/* 0x06 */ u16 combFilterGain; /* 0x08 */ f32 velocity;
/* 0x08 */ f32 freqScale;
} NoteAttributes; // size = 0xC } NoteAttributes; // size = 0xC
// Also known as a SubTrack, according to sm64 debug strings. // Also known as a SubTrack, according to sm64 debug strings.
@ -450,35 +449,32 @@ typedef struct SequenceLayer {
/* 0x00 */ u8 notePropertiesNeedInit : 1; /* 0x00 */ u8 notePropertiesNeedInit : 1;
/* 0x01 */ Stereo stereo; /* 0x01 */ Stereo stereo;
/* 0x02 */ u8 instOrWave; /* 0x02 */ u8 instOrWave;
/* 0x03 */ u8 gateTime; /* 0x03 */ s8 unk_3;
/* 0x04 */ u8 semitone; /* 0x04 */ u8 gateTime;
/* 0x05 */ u8 portamentoTargetNote; /* 0x05 */ u8 portamentoTargetNote;
/* 0x06 */ u8 pan; // 0..128 /* 0x06 */ u8 pan;
/* 0x07 */ u8 notePan; /* 0x07 */ u8 notePan;
/* 0x08 */ s16 delay; /* 0x08 */ Portamento portamento;
/* 0x0A */ s16 gateDelay;
/* 0x0C */ s16 delay2;
/* 0x0E */ u16 portamentoTime;
/* 0x10 */ s16 transposition; // #semitones added to play commands
// (seq instruction encoding only allows referring to the limited range
// 0..0x3F; this makes 0x40..0x7F accessible as well)
/* 0x12 */ s16 shortNoteDefaultDelay;
/* 0x14 */ s16 lastDelay;
/* 0x18 */ AdsrSettings adsr; /* 0x18 */ AdsrSettings adsr;
/* 0x20 */ Portamento portamento; /* 0x20 */ u16 portamentoTime;
/* 0x2C */ struct Note* note; /* 0x22 */ s16 transposition;
/* 0x30 */ f32 freqScale; /* 0x24 */ f32 freqScale;
/* 0x34 */ f32 bend; /* 0x28 */ f32 velocitySquare;
/* 0x38 */ f32 velocitySquare2; /* 0x2C */ f32 noteVelocity;
/* 0x3C */ f32 velocitySquare; // not sure which one of those corresponds to the sm64 original /* 0x30 */ f32 noteFreqScale;
/* 0x40 */ f32 noteVelocity; /* 0x34 */ u16 shortNoteDefaultDelay;
/* 0x44 */ f32 noteFreqScale; /* 0x36 */ u16 lastDelay;
/* 0x48 */ Instrument* instrument; /* 0x38 */ s16 delay;
/* 0x4C */ TunedSample* tunedSample; /* 0x3A */ s16 gateDelay;
/* 0x50 */ SequenceChannel* channel; /* 0x3C */ s16 delay2;
/* 0x54 */ SeqScriptState scriptState; /* 0x40 */ struct Note *note;
/* 0x70 */ AudioListItem listItem; /* 0x44 */ Instrument* instrument;
} SequenceLayer; // size = 0x80 /* 0x48 */ TunedSample *tunedSample;
/* 0x4C */ SequenceChannel *channel;
/* 0x50 */ SeqScriptState state;
/* 0x6C */ AudioListItem listItem;
/* 0x7C */ UNK_TYPE pad7C[4];
} SequenceLayer; //size = 0x80
typedef struct { typedef struct {
/* 0x000 */ s16 adpcmdecState[16]; /* 0x000 */ s16 adpcmdecState[16];
@ -514,9 +510,9 @@ typedef struct {
/* 0x10 */ f32 rate; /* 0x10 */ f32 rate;
/* 0x14 */ u8 active; /* 0x14 */ u8 active;
/* 0x16 */ u16 rateChangeTimer; /* 0x16 */ u16 rateChangeTimer;
/* 0x18 */ u16 depthChangeTimer; // /* 0x18 */ u16 depthChangeTimer;
/* 0x1A */ u16 delay; // /* 0x1A */ u16 delay;
} VibratoState; // size = 0x1C } VibratoState; // size = 0x18
typedef struct { typedef struct {
/* 0x00 */ u8 priority; /* 0x00 */ u8 priority;
@ -529,13 +525,13 @@ typedef struct {
/* 0x06 */ s16 adsrVolScaleUnused; /* 0x06 */ s16 adsrVolScaleUnused;
/* 0x08 */ f32 portamentoFreqScale; /* 0x08 */ f32 portamentoFreqScale;
/* 0x0C */ f32 vibratoFreqScale; /* 0x0C */ f32 vibratoFreqScale;
/* 0x10 */ SequenceLayer* prevParentLayer; /* 0x10 */ struct SequenceLayer* prevParentLayer;
/* 0x14 */ SequenceLayer* parentLayer; /* 0x14 */ struct SequenceLayer* parentLayer;
/* 0x18 */ SequenceLayer* wantedParentLayer; /* 0x18 */ struct SequenceLayer* wantedParentLayer;
/* 0x1C */ NoteAttributes attributes; /* 0x1C */ NoteAttributes attributes;
/* 0x28 */ AdsrState adsr; /* 0x28 */ AdsrState adsr;
/* 0x48 */ Portamento portamento; /* 0x48 */ Portamento portamento;
/* 0x54 */ VibratoState vibratoState; /* 0x58 */ VibratoState vibratoState;
} NotePlaybackState; // size = 0x70 } NotePlaybackState; // size = 0x70
typedef struct { typedef struct {
@ -556,7 +552,8 @@ typedef struct {
/* 0x01 */ u8 hasTwoParts : 1; /* 0x01 */ u8 hasTwoParts : 1;
/* 0x01 */ u8 useHaasEffect : 1; /* 0x01 */ u8 useHaasEffect : 1;
} bitField1; } bitField1;
/* 0x02 */ u8 pad2[0xE]; /* 0x02 */ u8 pad2[0xA];
/* 0x0C*/ s16* waveSampleAddr;
} NoteSubEu; // size = 0x10 } NoteSubEu; // size = 0x10
typedef struct Note { typedef struct Note {
@ -737,30 +734,33 @@ typedef struct {
/* 0x0C */ u8* curRamAddr; /* 0x0C */ u8* curRamAddr;
/* 0x10 */ u32 bytesRemaining; /* 0x10 */ u32 bytesRemaining;
/* 0x14 */ u32 chunkSize; /* 0x14 */ u32 chunkSize;
/* 0x18 */ s32 unkMediumParam; /* 0x18 */ OSMesg retMsg;
/* 0x1C */ u32 retMsg; /* 0x1C */ OSMesgQueue* retQueue;
/* 0x20 */ OSMesgQueue* retQueue; /* 0x20 */ OSMesgQueue msgQueue;
/* 0x24 */ OSMesgQueue msgQueue; /* 0x38 */ OSMesg msg;
/* 0x3C */ OSMesg msg; /* 0x3C */ OSIoMesg ioMesg;
/* 0x40 */ OSIoMesg ioMesg; } AudioAsyncLoad; // size = 0x54
} AudioAsyncLoad; // size = 0x58
typedef struct { typedef struct {
/* 0x00 */ u8 medium; /* 0x00 */ u8 medium;
/* 0x01 */ u8 seqOrFontId; /* 0x01 */ u8 seqOrFontId;
/* 0x02 */ u16 instId; /* 0x02 */ u8 instId;
/* 0x04 */ s32 unkMediumParam; /* 0x04 */ u32 curDevAddr;
/* 0x08 */ u32 curDevAddr; /* 0x08 */ u8* curRamAddr;
/* 0x0C */ u8* curRamAddr; /* 0x0C */ u8* ramAddr;
/* 0x10 */ u8* ramAddr; /* 0x10 */ s32 state;
/* 0x14 */ s32 state; /* 0x14 */ s32 bytesRemaining;
/* 0x18 */ s32 bytesRemaining; /* 0x18 */ s8* status; // write-only
/* 0x1C */ s8* status; // write-only /* 0x1C */ Sample sample;
/* 0x20 */ Sample sample; /* 0x2C */ OSMesgQueue msgQueue;
/* 0x30 */ OSMesgQueue msgQueue; /* 0x44 */ OSMesg msg;
/* 0x48 */ OSMesg msg; /* 0x48 */ OSIoMesg ioMesg;
/* 0x4C */ OSIoMesg ioMesg; } AudioSlowLoad; // size = 0x60
} AudioSlowLoad; // size = 0x64
typedef struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ AudioSlowLoad slowLoad[2];
} AudioSlowLoadBuffer; // size = 0xC4
typedef struct { typedef struct {
/* 0x00 */ u32 romAddr; /* 0x00 */ u32 romAddr;
@ -823,7 +823,7 @@ typedef struct {
/* 0x1E38 */ OSMesg externalLoadMsgBuf[16]; /* 0x1E38 */ OSMesg externalLoadMsgBuf[16];
/* 0x1E78 */ OSMesgQueue preloadSampleQueue; /* 0x1E78 */ OSMesgQueue preloadSampleQueue;
/* 0x1E90 */ OSMesg preloadSampleMsgBuf[16]; /* 0x1E90 */ OSMesg preloadSampleMsgBuf[16];
/* 0x1ED0 */ OSMesgQueue curAudioFrameDmaQueue; /* 0x1ED0 */ OSMesgQueue gCurAudioFrameDmaQueue;
/* 0x1EE8 */ OSMesg curAudioFrameDmaMsgBuf[64]; /* 0x1EE8 */ OSMesg curAudioFrameDmaMsgBuf[64];
/* 0x1FE8 */ OSIoMesg curAudioFrameDmaIoMsgBuf[64]; /* 0x1FE8 */ OSIoMesg curAudioFrameDmaIoMsgBuf[64];
/* 0x25E8 */ OSMesgQueue syncDmaQueue; /* 0x25E8 */ OSMesgQueue syncDmaQueue;
@ -858,7 +858,7 @@ typedef struct {
/* 0x289A */ s8 soundMode; /* 0x289A */ s8 soundMode;
/* 0x289C */ s32 totalTaskCount; // The total number of times the top-level function on the audio thread has run /* 0x289C */ s32 totalTaskCount; // The total number of times the top-level function on the audio thread has run
// since audio was initialized // since audio was initialized
/* 0x28A0 */ s32 curAudioFrameDmaCount; /* 0x28A0 */ s32 gCurAudioFrameDmaCount;
/* 0x28A4 */ s32 rspTaskIndex; /* 0x28A4 */ s32 rspTaskIndex;
/* 0x28A8 */ s32 curAiBufIndex; /* 0x28A8 */ s32 curAiBufIndex;
/* 0x28AC */ Acmd* abiCmdBufs[2]; // Pointer to audio heap where the audio binary interface command lists (for the /* 0x28AC */ Acmd* abiCmdBufs[2]; // Pointer to audio heap where the audio binary interface command lists (for the
@ -964,6 +964,37 @@ typedef struct {
AudioCacheEntry entry[32]; AudioCacheEntry entry[32];
} PermanentCache; // size = 0x190 } PermanentCache; // size = 0x190
typedef struct {
/* 0x00 */ s32 sampleBankId1;
/* 0x04 */ s32 sampleBankId2;
/* 0x08 */ s32 baseAddr1;
/* 0x0C */ s32 baseAddr2;
/* 0x10 */ u32 medium1;
/* 0x14 */ u32 medium2;
} SampleBankRelocInfo; // size = 0x18
typedef struct {
Drum** drums;
Instrument* instruments[1];
} SoundFontData;
typedef struct {
/* 0x0 */ u8 type;
/* 0x1 */ u8 unk_1;
/* 0x2 */ u32 unk_2;
/* 0x4 */ u8 unk_4;
/* 0x5 */ u8 unk_5;
/* 0x6 */ u8 unk_6;
/* 0x8 */ u16 unk_8;
} PlaylistCmd; // size:0xA
typedef struct {
/* 0x0 */ u16 unk_0;
/* 0x2 */ u16 unk_2;
/* 0x4 */ u8 unk_4;
/* 0x5 */ u8 unk_5;
} SoundTestTrack; // size: 0x6
void AudioHeap_ResetLoadStatus(void); void AudioHeap_ResetLoadStatus(void);
void AudioHeap_DiscardFont(s32 fontId); void AudioHeap_DiscardFont(s32 fontId);
void AudioHeap_DiscardSequence(s32 seqId); void AudioHeap_DiscardSequence(s32 seqId);
@ -973,46 +1004,118 @@ void AudioHeap_InitPool(AudioAllocPool* pool, void* ramAddr, u32 size);
void AudioHeap_InitPersistentCache(AudioPersistentCache* persistent); void AudioHeap_InitPersistentCache(AudioPersistentCache* persistent);
void AudioHeap_InitTemporaryCache(AudioTemporaryCache* temporary); void AudioHeap_InitTemporaryCache(AudioTemporaryCache* temporary);
void AudioHeap_ResetPool(AudioAllocPool* pool); void AudioHeap_ResetPool(AudioAllocPool* pool);
void func_8000BFE8(s32 arg0); void AudioHeap_InitMainPools(s32 initPoolSize);
void func_8000C044(AudioSessionPoolSplit* split); void AudioHeap_InitSessionPools(AudioSessionPoolSplit* split);
void func_8000C0C0(AudioCachePoolSplit* split); void AudioHeap_InitCachePools(AudioCachePoolSplit* split);
void func_8000C13C(AudioCommonPoolSplit* split); void AudioHeap_InitPersistentPoolsAndCaches(AudioCommonPoolSplit* split);
void func_8000C1F8(AudioCommonPoolSplit* split); void AudioHeap_InitTemporaryPoolsAndCaches(AudioCommonPoolSplit* split);
void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id); void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id);
s32 AudioHeap_SearchCaches(s32 tableType, s32 cache, s32 id); s32 AudioHeap_SearchCaches(s32 tableType, s32 cache, s32 id);
void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id); void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id);
void func_8000CAF4(f32 p, f32 q, u16* out); void func_8000CAF4(f32 p, f32 q, u16* out);
void func_8000CEC8(void); void AudioHeap_UpdateReverbs(void);
void func_8000D08C(void); void AudioHeap_ClearCurrentAiBuffer(void);
s32 func_8000D104(void); s32 AudioHeap_ResetStep(void);
void func_8000D4A8(void); void AudioHeap_Init(void);
void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id); void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id);
u8* func_8000DB64(s32 arg0, s32 arg1, u32 arg2); u8* AudioHeap_AllocPermanent(s32 tableType, s32 id, u32 size);
void* AudioHeap_AllocTemporarySampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium); void* AudioHeap_AllocTemporarySampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium);
void* AudioHeap_AllocPersistentSampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium); void* AudioHeap_AllocPersistentSampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium);
void* AudioHeap_AllocPersistentSampleCache_2(u32 size, s32 fontId, s32 sampleAddr, s8 medium); void* AudioHeap_AllocPersistentSampleCache_2(u32 size, s32 fontId, s32 sampleAddr, s8 medium);
void func_8000DCD4(u32 arg0, u32 arg1); void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize);
SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32 arg0); SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32 size);
void func_8000DFFC(SampleCacheEntry* entry); void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry);
void func_8000E1C4(SampleCacheEntry* entry, Sample* sample); void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, Sample* sample);
SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(u32 arg0); SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(u32 size);
void func_8000E290(void); void AudioHeap_DiscardSampleCaches(void);
void func_8000E8E0(s32);
void func_8000EBB4(AudioTable *, u8 *, u16);
void func_8000FFCC(void);
Instrument* func_80011D4C(s32, s32); void AudioLoad_DecreaseSampleDmaTtls(void);
Drum* func_80011DFC(s32, s32); void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, u32 arg2, u8* dmaIndexRef, s32 medium);
void AudioLoad_InitSampleDmaBuffers(s32 numNotes);
void AudioLoad_InitTable(AudioTable* table, u8* romAddr, u16 unkMediumParam);
void* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outFontId);
void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1);
s32 AudioLoad_SyncLoadSample(Sample* sample, s32 fontId);
s32 AudioLoad_SyncLoadInstrument(s32 fontId, s32 instId, s32 drumId);
void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, s32 arg1, s32 retData, OSMesgQueue* retQueue);
void AudioLoad_AsyncLoadSeq(s32 seqId, s32 arg1, s32 retData, OSMesgQueue* retQueue);
void* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts);
void AudioLoad_DiscardSeqFonts(s32 seqId);
s32 AudioLoad_DiscardFont(s32 fontId);
void AudioLoad_SyncInitSeqPlayer(s32 playerIdx, s32 seqId, s32 arg2);
void AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2);
void* AudioLoad_SyncLoadSeq(s32 seqId);
void* AudioLoad_SyncLoadSampleBank(u32 sampleBankId, s32* outMedium);
void* AudioLoad_SyncLoadFont(s32 fontId);
void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate);
s32 AudioLoad_GetLoadTableIndex(s32 tableType, u32 entryId);
void* AudioLoad_SearchCaches(s32 tableType, s32 id);
AudioTable* AudioLoad_GetLoadTable(s32 tableType);
void AudioLoad_RelocateFont(s32 fontId, u32 fontBaseAddr, void* relocData);
void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium);
void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* ramAddr, u32 size, s32 unkMediumParam);
s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, OSMesgQueue* retQueue, s32 medium, const char* dmaType);
s32 func_8000FC7C(u32 unkMediumParam, u32* addrPtr);
void func_8000FC8C(s32 unkParam2, u32 addr, u8* ramAddr, u32 size);
void AudioLoad_SyncLoadSimple(u32 tableType, u32 id);
void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue);
void AudioLoad_ProcessLoads(s32 resetStatus);
void AudioLoad_Init(void);
s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status);
Sample* AudioLoad_GetFontSample(s32 fontId, s32 instId);
void AudioLoad_Stub_10800(void);
void AudioLoad_FinishSlowLoad(AudioSlowLoad* arg0);
void AudioLoad_ProcessSlowLoads(s32 resetStatus);
void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, s32 size);
void AudioLoad_DmaSlowCopyUnkMedium(u32 devAddr, u8* ramAddr, u32 size, s32 unkMediumParam);
AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, u8* ramAddr, s32 size, s32 medium, s32 nChunks, OSMesgQueue* retQueue, u32 retMesg);
void AudioLoad_ProcessAsyncLoads(s32 resetStatus);
void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus);
void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, u32 size);
void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, u8* ramAddr, u32 size, s32 unkMediumParam);
void AudioLoad_RelocateSample(TunedSample* tSample, u32 fontDataAddr, SampleBankRelocInfo* relocInfo);
s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, SampleBankRelocInfo* relocData, s32 isAsync);
s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus);
s32 AudioLoad_AddToSampleSet(Sample* sample, s32 numSamples, Sample** sampleSet);
s32 AudioLoad_GetSamplesForFont(s32 fontId, Sample** sampleSet);
void func_80011890(Note*, NoteAttributes*);
void func_80011C58(Note*, f32);
Instrument* Audio_GetInstrument(s32, s32);
Drum* Audio_GetDrum(s32, s32);
void func_80011EB8(Note*);
void func_80011F4C(Note*); void func_80011F4C(Note*);
void func_80012438(SequenceLayer*, s32);
void func_8001266C(SequenceLayer*);
void func_8001268C(SequenceLayer*);
s32 func_800126AC(Note*, SequenceLayer*, s32);
void func_800127B0(Note*, SequenceLayer*);
void func_80012854(AudioListItem*);
void func_80012864(NotePool*);
void func_800128B4(void); void func_800128B4(void);
void func_80012964(NotePool*);
void func_80012AC4(NotePool*, s32);
void func_80012C00(AudioListItem*, AudioListItem*);
void func_80012C40(Note*); void func_80012C40(Note*);
Note* func_80012C6C(AudioListItem*, s32);
void func_80012CEC(Note *, SequenceLayer *);
void func_80012E28(Note *, SequenceLayer *);
void func_80012E5C(Note* , SequenceLayer *);
Note *func_80012E88(NotePool* , SequenceLayer *);
Note *func_80012ED4(NotePool* , SequenceLayer *);
Note *func_80012F24(NotePool* , SequenceLayer *);
Note *func_8001301C(SequenceLayer *);
void func_800132E8(void); void func_800132E8(void);
void func_800144E4(SequencePlayer*); void func_800144E4(SequencePlayer*);
void func_800145BC(UNK_TYPE*, Note*); void func_800145BC(AudioListItem*, AudioListItem*);
void func_80016804(s32);
void func_800168BC(void); void func_800168BC(void);
void func_80016A50(void); void func_80016A50(void);
void func_800182F4(s32); void func_800182F4(s32);
void func_80019290(s32, void*); void func_80019290(s32, void*);
@ -1060,147 +1163,205 @@ void func_8001EE00(void);
void func_8001EE3C(void); void func_8001EE3C(void);
extern AudioTable D_800C3610;
extern AudioTable D_800C3660; extern u8 D_800C57E8[4];
extern AudioTable D_800C3A90;
extern UNK_TYPE D_800C3CB0; extern u8 gChannelsPerBank[5][5];
extern u8 gUsedChannelsPerBank[5][5];
extern u8 gSfxRequestWriteIndex;
extern u8 gSfxRequestReadIndex;
extern u8 gSfxChannelLayout;
extern u16 D_800C5D24;
extern f32 gDefaultSfxPos[3];
extern f32 gDefaultScale;
extern s8 gDefaultReverb;
extern s32 D_800C5D40;
extern u8 gSeqCmdWritePos;
extern u8 gSeqCmdReadPos;
extern u8 gStartSeqDisabled;
extern u8 gSoundModeList[3];
extern u8 D_800C5D54;
extern u8 D_800C5D58;
// file split?
extern u8 D_800C5D60;
extern u8 D_800C5D64;
extern u8 D_800C5D68[3];
extern u8 D_800C5D6C[29][7];
extern u8 D_800C5E38[29];
extern s32 D_800C5E58[5];
// file split?
extern u8 D_800C5E70;
extern f32 gSfxVolScale;
extern f32 gSfxFreqScale;
extern u8 gPlaylistIndex;
extern s32 gPlaylistTimer;
extern u8 gPlaylistCmdIndex;
extern u32 D_800C5E88[];
extern SoundTestTrack D_800C5EE4[];
extern PlaylistCmd gPlaylists[][100];
// file split?
extern f32 D_800C7380;
extern s32 D_800C7384;
extern s32 D_800C7388;
extern u8 D_800C738C;
extern u8 D_800C7390;
extern u8 D_800C7394;
extern s32 D_800C7398[128];
extern f32 D_800C7414;
extern f32 D_800C7418[16][2];
extern f32 D_800C749C[13];
extern AudioSpec gAudioSpecs[];
extern s16 gSeqTicksPerBeat;
extern s32 gAudioHeapSize;
extern s32 gInitPoolSize;
extern u32 gPermanentPoolSize;
extern u16 gSequenceMedium;
extern u16 gSoundFontMedium;
extern u16 gSampleBankMedium;
extern s8 gThreadCmdWritePos;
extern s8 gThreadCmdReadPos;
extern OSMesgQueue* gAudioTaskStartQueue;
extern OSMesgQueue* gThreadCmdProcQueue;
extern OSMesgQueue* gAudioUnkQueue;
extern OSMesgQueue* gAudioResetQueue;
extern s32 gMaxAbiCmdCnt;
extern AudioTask* gWaitingAudioTask;
extern s32 D_800C7C70;
extern u8 gCurCmdReadPos;
extern u8 gThreadCmdQueueFinished;
extern s32 D_80146D80;
extern AudioSlowLoadBuffer gSlowLoads;
// extern AudioSlowLoad D_80146D94[2];
extern f32 D_800C5D28[]; extern u64 gAudioContextStart[4];
extern f32 D_800C5D34; extern SynthesisReverb gSynthReverbs[4];
extern s8 D_800C5D3C;
extern s16 D_800C7C2C;
extern s32 D_800C7C30;
extern s32 D_800C7C34;
extern u32 D_800C7C38;
extern u16 D_800C7C3C;
extern u16 D_800C7C40;
extern u16 D_800C7C44;
extern s8 D_800C7C50;
extern s8 D_800C7C54;
extern OSMesgQueue* D_800C7C58;
extern OSMesgQueue* D_800C7C5C;
extern OSMesgQueue* D_800C7C60;
extern OSMesgQueue* D_800C7C64;
extern AudioSpec D_800C76B8[];
extern s32 D_80146D90;
extern AudioSlowLoad D_80146D94[2];
extern u64 D_8014BA40[];
// 0x10
extern SynthesisReverb D_8014BA50[4];
// 0x10 // 0x10
extern u16 D_8014C1B0; extern u16 D_8014C1B0;
extern s8 D_8014C1B2; extern s8 D_8014C1B2;
extern s8 D_8014C1B3; extern s8 gNumSynthReverbs;
extern s16 D_8014C1B4; extern s16 D_8014C1B4;
extern NoteSubEu* D_8014C1B8; extern NoteSubEu* gNoteSubsEu;
// 0x4 // 0x4
extern AudioAllocPool D_8014C1C0; extern AudioAllocPool gSessionPool;
extern AudioAllocPool D_8014C1D0; extern AudioAllocPool gInitPool;
extern AudioAllocPool D_8014C1E0; extern AudioAllocPool gMiscPool;
// 0x20 // 0x20
extern AudioAllocPool D_8014C210; extern AudioAllocPool gCachePool;
extern AudioAllocPool D_8014C220; extern AudioAllocPool gPersistentCommonPool;
extern AudioAllocPool D_8014C230; extern AudioAllocPool gTemporaryCommonPool;
extern AudioCache D_8014C240; // seqCache extern AudioCache gSeqCache; // seqCache
extern AudioCache D_8014C410; // fontCache extern AudioCache gFontCache; // fontCache
extern AudioCache D_8014C5E0; // sampleBankCache extern AudioCache gSampleBankCache; // sampleBankCache
extern PermanentCache D_8014C7B0; extern PermanentCache gPermanentPool;
extern AudioSampleCache D_8014C940; extern AudioSampleCache gPersistentSampleCache;
// 0x4 // 0x4
extern AudioSampleCache D_8014CE58; extern AudioSampleCache gTemporarySampleCache;
// 0x4 // 0x4
extern AudioSessionPoolSplit D_8014D370; extern AudioSessionPoolSplit gSessionPoolSplit;
extern AudioCachePoolSplit D_8014D380; extern AudioCachePoolSplit gCachePoolSplit;
extern AudioCommonPoolSplit D_8014D388; extern AudioCommonPoolSplit gPersistentCommonPoolSplit;
// 0x4 // 0x4
extern AudioCommonPoolSplit D_8014D398; extern AudioCommonPoolSplit gTemporaryCommonPoolSplit;
// 0x4 // 0x4
extern u8 D_8014D3A8[64]; extern u8 gSampleFontLoadStatus[64];
extern u8 D_8014D3E8[64]; extern u8 gFontLoadStatus[64];
extern u8 D_8014D428[256]; extern u8 gSeqLoadStatus[256];
extern volatile u8 D_8014D528; extern volatile u8 gResetStatus;
extern u8 D_8014D529; extern u8 gAudioSpecId;
extern s32 D_8014D52C; extern s32 gResetFadeoutFramesLeft;
// 0x1000 gap // 0x1000 gap
extern Note* D_8014E530; extern Note* gNotes;
// 0x4 // 0x4
extern SequencePlayer D_8014E538[4]; extern SequencePlayer gSeqPlayers[4];
// D_8014EA68 extern SequenceChannel gSeqChannels[48];
// 0x4658 extern SequenceLayer gSeqLayers[64];
extern UNK_TYPE D_801530C0; // size 0x40? extern SequenceChannel gSeqChannelNone;
extern Sample* D_80153100[128]; extern AudioListItem gLayerFreeList;
extern AudioPreloadReq D_80153300[128]; extern NotePool gNoteFreeLists;
extern s32 D_80153D00; extern Sample* gUsedSamples[128];
extern s32 D_80153D04; extern AudioPreloadReq gPreloadSampleStack[128];
extern s8 D_80153D08; extern s32 gNumUsedSamples;
// 0x540 extern s32 gPreloadSampleStackTop;
extern OSMesgQueue D_80154248; extern AudioAsyncLoad gAsyncLoads[16];
extern OSMesg D_80154260[16]; extern OSMesgQueue gExternalLoadQueue;
extern OSMesgQueue D_801542A0; extern OSMesg gExternalLoadMsg[16];
extern OSMesg D_801542B8[16]; extern OSMesgQueue gPreloadSampleQueue;
extern OSMesgQueue D_801542F8; extern OSMesg gPreloadSampleMsg[16];
extern OSMesg D_80154310[64]; extern OSMesgQueue gCurAudioFrameDmaQueue;
extern OSIoMesg D_80154410[64]; extern OSMesg gCurAudioFrameDmaMsg[64];
extern OSMesgQueue D_80154A10; extern OSIoMesg gCurAudioFrameDmaIoMsgBuf[64];
extern OSMesg D_80154A28[1]; extern OSMesgQueue gSyncDmaQueue;
extern OSMesg gSyncDmaMsg[1];
// 0x4 // 0x4
extern OSIoMesg D_80154A30; extern OSIoMesg gSyncDmaIoMsg;
extern SampleDma D_80154A48[0x100]; extern SampleDma gSampleDmas[0x100];
extern u32 D_80155A48; extern u32 gSampleDmaCount;
extern u32 D_80155A4C; extern u32 gSampleDmaListSize1;
extern s32 D_80155A50; extern s32 D_80155A50;
// 0x4 // 0x4
extern u8 D_80155A58[0x100]; extern u8 gSampleDmaReuseQueue1[0x100];
extern u8 D_80155B58[0x100]; extern u8 gSampleDmaReuseQueue2[0x100];
extern u8 D_80155C58; extern u8 gSampleDmaReuseQueue1RdPos;
extern u8 D_80155C59; extern u8 gSampleDmaReuseQueue2RdPos;
extern u8 D_80155C5A; extern u8 gSampleDmaReuseQueue1WrPos;
extern u8 D_80155C5B; extern u8 gSampleDmaReuseQueue2WrPos;
extern AudioTable *D_80155C5C; extern AudioTable *gSequenceTable;
extern AudioTable* D_80155C60; extern AudioTable* gSoundFontTable;
extern AudioTable *D_80155C64; extern AudioTable *gSampleBankTable;
extern UNK_TYPE *D_80155C68; extern u8 *gSeqFontTable;
extern s16 D_80155C6C; extern s16 gNumSequences;
extern SoundFont* D_80155C70; extern SoundFont* gSoundFontList;
extern AudioBufferParameters D_80155C78; // 0x4
extern s32 D_80155C98; extern AudioBufferParameters gAudioBufferParams;
extern s32 D_80155C9C; extern s32 gSampleDmaBuffSize;
extern s32 D_80155CA0; extern s32 gMaxAudioCmds;
extern u16 D_80155CA4; extern s32 gNumNotes;
extern s8 D_80155CA6; extern u16 gMaxTempo;
extern volatile s32 D_80155CA8; extern s8 gAudioSoundMode;
extern s32 D_80155CAC; extern volatile s32 gAudioTaskCountQ;
extern s32 D_80155CB0; extern s32 gCurAudioFrameDmaCount;
extern s32 D_80155CB4; extern s32 gAudioTaskIndexQ;
extern void* D_80155CB8[2]; extern s32 gCurAiBuffIndex;
extern UNK_TYPE D_80155CC0; extern void* gAbiCmdBuffs[2];
extern AudioTask* D_80155CC4; extern Acmd* gCurAiCmdBuffer;
extern AudioTask D_80155CC8[2]; extern AudioTask* gAudioCurTask;
extern f32 D_80155D68; extern AudioTask gAudioRspTasks[2];
extern s32 D_80155D6C; extern f32 gMaxTempoTvTypeFactors;
extern u16* D_80155D70[3]; extern s32 gRefreshRate;
extern u16 D_80155D7C[3]; extern u16* gAiBuffers[3];
extern UNK_TYPE D_80155D84; extern u16 gAiBuffLengths[3];
extern UNK_TYPE gAudioRandom;
extern UNK_TYPE D_80155D88; extern UNK_TYPE D_80155D88;
extern volatile u32 D_80155D8C; extern volatile u32 gResetTimer;
extern u64 D_80155D90[]; extern u64 gAudioContextEnd[4];
extern OSMesg D_80156600[1];
extern OSMesg D_80156608[4]; extern OSMesgQueue sAudioTaskStartQueue;
extern OSMesg D_80156618[1]; extern OSMesgQueue sThreadCmdProcQueue;
extern OSMesg D_8015661C[1]; extern OSMesgQueue sAudioUnkQueue;
extern OSMesgQueue sAudioResetQueue;
extern AudioCmd gThreadCmdBuffer[256];
extern OSMesg D_80156600[1];
extern OSMesg D_80156608[4];
extern OSMesg D_80156618[1];
extern OSMesg D_8015661C[1];

18
include/variables.h
View file

@ -7,15 +7,15 @@
#include "sf64object.h" #include "sf64object.h"
#include "sf64player.h" #include "sf64player.h"
extern f32 D_800C5D28[]; extern f32 gDefaultSfxPos[];
extern f32 D_800C5D34; extern f32 gDefaultScale;
extern s8 D_800C5D3C; extern s8 gDefaultReverb;
extern s8 D_800C7C50; extern s8 gThreadCmdWritePos;
extern s8 D_800C7C54; extern s8 gThreadCmdReadPos;
extern OSMesgQueue* D_800C7C58; extern OSMesgQueue* gAudioTaskStartQueue;
extern OSMesgQueue* D_800C7C5C; extern OSMesgQueue* gThreadCmdProcQueue;
extern OSMesgQueue* D_800C7C60; extern OSMesgQueue* gAudioUnkQueue;
extern OSMesgQueue* D_800C7C64; extern OSMesgQueue* gAudioResetQueue;
extern OSMesg D_80156600[1]; extern OSMesg D_80156600[1];
extern OSMesg D_80156608[4]; extern OSMesg D_80156608[4];

9
linker_scripts/us/symbol_addrs.txt
View file

@ -25,7 +25,12 @@ D_8000001C = 0x8000001C;//ignore:true
D_80000024 = 0x80000024;//ignore:true D_80000024 = 0x80000024;//ignore:true
D_801D0001 = 0x801D0001;//ignore:true D_801D0001 = 0x801D0001;//ignore:true
D_80180001 = 0x80180001;//ignore:true D_80180001 = 0x80180001;//ignore:true
D_80180000 = 0x80180000;//ignore:true
D_80160000 = 0x80160000;//ignore:true
D_800D0000 = 0x800D0000;//ignore:true
D_7FFFFFFE = 0x7FFFFFFE;//ignore:true D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
D_1000000 = 0x01000000;//ignore:true
D_A000000 = 0x0A000000;//ignore:true
// constant for K1 access // constant for K1 access
D_A0000000 = 0xA0000000;//ignore:true D_A0000000 = 0xA0000000;//ignore:true
@ -35,7 +40,7 @@ D_BFF00000 = 0xBFF00000;//ignore:true
D_BFF08000 = 0xBFF08000;//ignore:true D_BFF08000 = 0xBFF08000;//ignore:true
D_BFF08004 = 0xBFF08004;//ignore:true D_BFF08004 = 0xBFF08004;//ignore:true
// RDB regs used only in exceptasm // RDB regs used only in exceptasm. Also 2.0f
D_C0000000 = 0xC0000000;//ignore:true D_C0000000 = 0xC0000000;//ignore:true
D_C0000008 = 0xC0000008;//ignore:true D_C0000008 = 0xC0000008;//ignore:true
D_C000000C = 0xC000000C;//ignore:true D_C000000C = 0xC000000C;//ignore:true
@ -64,7 +69,7 @@ D_801613E0 = 0x801613E0;//size:0x18
D_800CC124 = 0x800CC124;//type:u8 D_800CC124 = 0x800CC124;//type:u8
D_800C9E90 = 0x800C9E90;//size:0x70 D_800C9E90 = 0x800C9E90;//size:0x70
D_800D3180 = 0x800D3180; // size:0x1E D_800D3180 = 0x800D3180; // size:0x20
gSetupDLs = 0x800D31B0; // size:0x18C0 gSetupDLs = 0x800D31B0; // size:0x18C0
D_800CFCA0 = 0x800CFCA0; D_800CFCA0 = 0x800CFCA0;

3
linker_scripts/us/symbol_addrs_EBFBE0.txt
View file

@ -8,7 +8,8 @@ D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu
sPlanetList = 0x801AF7E8;// segment:ovl_menu sPlanetList = 0x801AF7E8;// segment:ovl_menu
spectrumAnalizerMode = 0x801B9318;// segment:ovl_menu spectrumAnalizerMode = 0x801B9318;// segment:ovl_menu
sPaths = 0x801AFD18; // segment:ovl_menu D_menu_801AE998 = 0x801AE998; //size:4 segment:ovl_menu
sPaths = 0x801AFD18; // segment:ovl_menu
D_menu_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu D_menu_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu
D_menu_801B7BA0 = 0x801B7BA0;// segment:ovl_menu D_menu_801B7BA0 = 0x801B7BA0;// segment:ovl_menu
D_menu_801B8248 = 0x801B8248; // size:0x28 segment:ovl_menu D_menu_801B8248 = 0x801B8248; // size:0x28 segment:ovl_menu

310
linker_scripts/us/symbol_addrs_audio.txt
View file

@ -1,7 +1,187 @@
D_800C57EC = 0x800C57EC; gSampleBankTableInit = 0x800C3610;
D_800C7380 = 0x800C7380; gSampleBankTableInitEntries = 0x800C3620;
D_800C5FF4 = 0x800C5FF4; //type:u16 size:5000 gSeqTableInit = 0x800C3660;
gSeqTableInitEntries = 0x800C3670;
gSoundFontTableInit = 0x800C3A90;
gSoundFontTableInitEntries = 0x800C3AA0;
gSeqFontTableInit = 0x800C3CB0;
// data
D_800C57E8 = 0x800C57E8;
gChannelsPerBank = 0x800C5CE0; //type:u8 size:0x1C
gUsedChannelsPerBank = 0x800C5CFC; //type:u8 size:0x1C
gSfxRequestWriteIndex = 0x800C5D18;
gSfxRequestReadIndex = 0x800C5D1C;
gSfxChannelLayout = 0x800C5D20;
D_800C5D24 = 0x800C5D24;
gDefaultSfxPos = 0x800C5D28;
gDefaultScale = 0x800C5D34;
gDefaultReverb = 0x800C5D3C;
D_800C5D40 = 0x800C5D40;
gSeqCmdWritePos = 0x800C5D44;
gSeqCmdReadPos = 0x800C5D48;
gStartSeqDisabled = 0x800C5D4C;
gSoundModeList = 0x800C5D50;
D_800C5D54 = 0x800C5D54;
D_800C5D58 = 0x800C5D58;
D_800C5D60 = 0x800C5D60;
D_800C5D64 = 0x800C5D64;
D_800C5D68 = 0x800C5D68;
D_800C5D6C = 0x800C5D6C;
D_800C5E38 = 0x800C5E38;
D_800C5E58 = 0x800C5E58;
D_800C5E70 = 0x800C5E70;
gSfxVolScale = 0x800C5E74;
gSfxFreqScale = 0x800C5E78;
gPlaylistIndex = 0x800C5E7C;
gPlaylistTimer = 0x800C5E80;
gPlaylistCmdIndex = 0x800C5E84;
D_800C5E88 = 0x800C5E88;
D_800C5EE4 = 0x800C5EE4;
gPlaylists = 0x800C5FF4; //type:u16 size:5000
D_800C7380 = 0x800C7380;
D_800C7384 = 0x800C7384;
D_800C7388 = 0x800C7388;
D_800C738C = 0x800C738C;
D_800C7390 = 0x800C7390;
D_800C7394 = 0x800C7394;
D_800C7398 = 0x800C7398;
D_800C7414 = 0x800C7414;
D_800C7418 = 0x800C7418;
D_800C749C = 0x800C749C;
gAudioSpecs = 0x800C76B8;
gSeqTicksPerBeat = 0x800C7C2C;
gAudioHeapSize = 0x800C7C30;
gInitPoolSize = 0x800C7C34;
gPermanentPoolSize = 0x800C7C38;
gSequenceMedium = 0x800C7C3C;
gSoundFontMedium = 0x800C7C40;
gSampleBankMedium = 0x800C7C44;
gThreadCmdWritePos = 0x800C7C50;
gThreadCmdReadPos = 0x800C7C54;
gAudioTaskStartQueue = 0x800C7C58;
gThreadCmdProcQueue = 0x800C7C5C;
gAudioUnkQueue = 0x800C7C60;
gAudioResetQueue = 0x800C7C64;
gMaxAbiCmdCnt = 0x800C7C68;
gWaitingAudioTask = 0x800C7C6C;
D_800C7C70 = 0x800C7C70;
gCurCmdReadPos = 0x800C7C74;
gThreadCmdQueueFinished = 0x800C7C78;
// bss
D_80146D80 = 0x80146D80;
gSlowLoads = 0x80146D90; // size:0xC4
gAudioContextStart = 0x8014BA40; // size:0x10
gSynthReverbs = 0x8014BA50; // size:0x750
D_8014C1B0 = 0x8014C1B0;
D_8014C1B2 = 0x8014C1B2;
gNumSynthReverbs = 0x8014C1B3;
D_8014C1B4 = 0x8014C1B4;
gNoteSubsEu = 0x8014C1B8;
gSessionPool = 0x8014C1C0; //size:0x10
gInitPool = 0x8014C1D0; //size:0x10
gMiscPool = 0x8014C1E0; //size:0x10
gCachePool = 0x8014C210;//size:0x10
gPersistentCommonPool = 0x8014C220;//size:0x10
gTemporaryCommonPool = 0x8014C230;//size:0x10
gSeqCache = 0x8014C240;//size:0x1D0
gFontCache = 0x8014C410;//size:0x1D0
gSampleBankCache = 0x8014C5E0;//size:0x1D0
gPermanentPool = 0x8014C7B0;//size:0x190
gPersistentSampleCache = 0x8014C940;//size:0x514
gTemporarySampleCache = 0x8014CE58;//size:0x514
gSessionPoolSplit = 0x8014D370;//size:0x10
gCachePoolSplit = 0x8014D380;//size:0x8
gPersistentCommonPoolSplit = 0x8014D388;//size:0xC
gTemporaryCommonPoolSplit = 0x8014D398;//size:0xC
gSampleFontLoadStatus = 0x8014D3A8;//size:0x40
gFontLoadStatus = 0x8014D3E8;//size:0x40
gSeqLoadStatus = 0x8014D428;//size:0x100
gResetStatus = 0x8014D528;
gAudioSpecId = 0x8014D529;
gResetFadeoutFramesLeft = 0x8014D52C;
gNotes = 0x8014E530;
gSeqPlayers = 0x8014E538;//size:0x530
gSeqChannels = 0x8014EA68;//size:0x2580
gSeqLayers = 0x80150FE8;//size:0x2000
gSeqChannelNone = 0x80152FE8;//size:0xC8
gLayerFreeList = 0x801530B0;//size:0x10
gNoteFreeLists = 0x801530C0;//size:0x40
gUsedSamples = 0x80153100;//size:0x200
gPreloadSampleStack = 0x80153300;//size:0xA00
gNumUsedSamples = 0x80153D00;
gPreloadSampleStackTop = 0x80153D04;
gAsyncLoads = 0x80153D08;//size:0x540
gExternalLoadQueue = 0x80154248;//size:0x18
gExternalLoadMsg = 0x80154260;//size:0x40
gPreloadSampleQueue = 0x801542A0;//size:0x18
gPreloadSampleMsg = 0x801542B8;//size:0x40
gCurAudioFrameDmaQueue = 0x801542F8;//size:0x18
gCurAudioFrameDmaMsg = 0x80154310;//size:0x100
gCurAudioFrameDmaIoMsgBuf = 0x80154410;//size:0x600
gSyncDmaQueue = 0x80154A10;//size:0x18
gSyncDmaMsg = 0x80154A28;
gSyncDmaIoMsg = 0x80154A30;//size:0x18
gSampleDmas = 0x80154A48;//size:0x1000
gSampleDmaCount = 0x80155A48;
gSampleDmaListSize1 = 0x80155A4C;
D_80155A50 = 0x80155A50;
gSampleDmaReuseQueue1 = 0x80155A58;//size:0x100
gSampleDmaReuseQueue2 = 0x80155B58;//size:0x100
gSampleDmaReuseQueue1RdPos = 0x80155C58;
gSampleDmaReuseQueue2RdPos = 0x80155C59;
gSampleDmaReuseQueue1WrPos = 0x80155C5A;
gSampleDmaReuseQueue2WrPos = 0x80155C5B;
gSequenceTable = 0x80155C5C;
gSoundFontTable = 0x80155C60;
gSampleBankTable = 0x80155C64;
gSeqFontTable = 0x80155C68;
gNumSequences = 0x80155C6C;
gSoundFontList = 0x80155C70;
gAudioBufferParams = 0x80155C78;//size:0x20
gSampleDmaBuffSize = 0x80155C98;
gMaxAudioCmds = 0x80155C9C;
gNumNotes = 0x80155CA0;
gMaxTempo = 0x80155CA4;
gAudioSoundMode = 0x80155CA6;
gAudioTaskCountQ = 0x80155CA8;
gCurAudioFrameDmaCount = 0x80155CAC;
gAudioTaskIndexQ = 0x80155CB0;
gCurAiBuffIndex = 0x80155CB4;
gAbiCmdBuffs = 0x80155CB8;//size:0x8
gCurAiCmdBuffer = 0x80155CC0;
gAudioCurTask = 0x80155CC4;
gAudioRspTasks = 0x80155CC8;//size:0xA0
gMaxTempoTvTypeFactors = 0x80155D68;
gRefreshRate = 0x80155D6C;
gAiBuffers = 0x80155D70;//size:0xC
gAiBuffLengths = 0x80155D7C;//size:0x8
gAudioRandom = 0x80155D84;
D_80155D88 = 0x80155D88;
gResetTimer = 0x80155D8C;
gAudioContextEnd = 0x80155D90;//size:0x10
sAudioTaskStartQueue = 0x80155DA0;
sThreadCmdProcQueue = 0x80155DB8;
sAudioUnkQueue = 0x80155DD0;
sAudioResetQueue = 0x80155DE8;
gThreadCmdBuffer = 0x80155E00;
D_80156600 = 0x80156600;
D_80156608 = 0x80156608;
D_80156618 = 0x80156618;
D_8015661C = 0x8015661C;
// functions
func_800080C0 = 0x800080C0; func_800080C0 = 0x800080C0;
func_80008364 = 0x80008364; func_80008364 = 0x80008364;
func_80008780 = 0x80008780; func_80008780 = 0x80008780;
@ -34,89 +214,89 @@ AudioHeap_InitPool = 0x8000BF6C;
AudioHeap_InitPersistentCache = 0x8000BF94; AudioHeap_InitPersistentCache = 0x8000BF94;
AudioHeap_InitTemporaryCache = 0x8000BFA8; AudioHeap_InitTemporaryCache = 0x8000BFA8;
AudioHeap_ResetPool = 0x8000BFD8; AudioHeap_ResetPool = 0x8000BFD8;
func_8000BFE8 = 0x8000BFE8; AudioHeap_InitMainPools = 0x8000BFE8;
func_8000C044 = 0x8000C044; AudioHeap_InitSessionPools = 0x8000C044;
func_8000C0C0 = 0x8000C0C0; AudioHeap_InitCachePools = 0x8000C0C0;
func_8000C13C = 0x8000C13C; AudioHeap_InitPersistentPoolsAndCaches = 0x8000C13C;
func_8000C1F8 = 0x8000C1F8; AudioHeap_InitTemporaryPoolsAndCaches = 0x8000C1F8;
AudioHeap_AllocCached = 0x8000C2B4; AudioHeap_AllocCached = 0x8000C2B4;
AudioHeap_SearchCaches = 0x8000C990; AudioHeap_SearchCaches = 0x8000C990;
AudioHeap_SearchRegularCaches = 0x8000C9E8; AudioHeap_SearchRegularCaches = 0x8000C9E8;
func_8000CAF4 = 0x8000CAF4; func_8000CAF4 = 0x8000CAF4;
func_8000CEC8 = 0x8000CEC8; AudioHeap_UpdateReverbs = 0x8000CEC8;
func_8000D08C = 0x8000D08C; AudioHeap_ClearCurrentAiBuffer = 0x8000D08C;
func_8000D104 = 0x8000D104; AudioHeap_ResetStep = 0x8000D104;
func_8000D4A8 = 0x8000D4A8; AudioHeap_Init = 0x8000D4A8;
AudioHeap_SearchPermanentCache = 0x8000DB0C; AudioHeap_SearchPermanentCache = 0x8000DB0C;
func_8000DB64 = 0x8000DB64; AudioHeap_AllocPermanent = 0x8000DB64;
AudioHeap_AllocTemporarySampleCache = 0x8000DBE4; AudioHeap_AllocTemporarySampleCache = 0x8000DBE4;
AudioHeap_AllocPersistentSampleCache = 0x8000DC34; AudioHeap_AllocPersistentSampleCache = 0x8000DC34;
AudioHeap_AllocPersistentSampleCache_2 = 0x8000DC84; AudioHeap_AllocPersistentSampleCache_2 = 0x8000DC84;
func_8000DCD4 = 0x8000DCD4; AudioHeap_InitSampleCaches = 0x8000DCD4;
AudioHeap_AllocTemporarySampleCacheEntry = 0x8000DD68; AudioHeap_AllocTemporarySampleCacheEntry = 0x8000DD68;
func_8000DFFC = 0x8000DFFC; AudioHeap_DiscardSampleCacheEntry = 0x8000DFFC;
func_8000E1C4 = 0x8000E1C4; AudioHeap_UnapplySampleCache = 0x8000E1C4;
AudioHeap_AllocPersistentSampleCacheEntry = 0x8000E208; AudioHeap_AllocPersistentSampleCacheEntry = 0x8000E208;
func_8000E290 = 0x8000E290; AudioHeap_DiscardSampleCaches = 0x8000E290;
func_8000E4A0 = 0x8000E4A0; AudioLoad_DecreaseSampleDmaTtls = 0x8000E4A0;
func_8000E5A8 = 0x8000E5A8; AudioLoad_DmaSampleData = 0x8000E5A8;
func_8000E8E0 = 0x8000E8E0; AudioLoad_InitSampleDmaBuffers = 0x8000E8E0;
func_8000EBB4 = 0x8000EBB4; AudioLoad_InitTable = 0x8000EBB4;
func_8000EC14 = 0x8000EC14; AudioLoad_SyncLoadSeqFonts = 0x8000EC14;
func_8000ECC0 = 0x8000ECC0; AudioLoad_SyncLoadSeqParts = 0x8000ECC0;
func_8000ED28 = 0x8000ED28; AudioLoad_SyncLoadSample = 0x8000ED28;
func_8000EE14 = 0x8000EE14; AudioLoad_SyncLoadInstrument = 0x8000EE14;
func_8000EEE4 = 0x8000EEE4; AudioLoad_AsyncLoadSampleBank = 0x8000EEE4;
func_8000EF48 = 0x8000EF48; AudioLoad_AsyncLoadSeq = 0x8000EF48;
func_8000F010 = 0x8000F010; AudioLoad_GetFontsForSequence = 0x8000F010;
func_8000F078 = 0x8000F078; AudioLoad_DiscardSeqFonts = 0x8000F078;
func_8000F158 = 0x8000F158; AudioLoad_DiscardFont = 0x8000F158;
func_8000F200 = 0x8000F200; AudioLoad_SyncInitSeqPlayer = 0x8000F200;
func_8000F220 = 0x8000F220; AudioLoad_SyncInitSeqPlayerInternal = 0x8000F220;
func_8000F354 = 0x8000F354; AudioLoad_SyncLoadSeq = 0x8000F354;
func_8000F388 = 0x8000F388; AudioLoad_SyncLoadSampleBank = 0x8000F388;
func_8000F478 = 0x8000F478; AudioLoad_SyncLoadFont = 0x8000F478;
func_8000F554 = 0x8000F554; AudioLoad_SyncLoad = 0x8000F554;
func_8000F790 = 0x8000F790; AudioLoad_GetLoadTableIndex = 0x8000F790;
func_8000F7CC = 0x8000F7CC; AudioLoad_SearchCaches = 0x8000F7CC;
func_8000F820 = 0x8000F820; AudioLoad_GetLoadTable = 0x8000F820;
func_8000F864 = 0x8000F864; AudioLoad_RelocateFont = 0x8000F864;
func_8000FA28 = 0x8000FA28; AudioLoad_SyncDma = 0x8000FA28;
func_8000FB50 = 0x8000FB50; AudioLoad_SyncDmaUnkMedium = 0x8000FB50;
func_8000FBA8 = 0x8000FBA8; AudioLoad_Dma = 0x8000FBA8;
func_8000FC7C = 0x8000FC7C; func_8000FC7C = 0x8000FC7C;
func_8000FC8C = 0x8000FC8C; func_8000FC8C = 0x8000FC8C;
func_8000FCA0 = 0x8000FCA0; AudioLoad_SyncLoadSimple = 0x8000FCA0;
func_8000FCC0 = 0x8000FCC0; AudioLoad_AsyncLoadInner = 0x8000FCC0;
func_8000FF9C = 0x8000FF9C; AudioLoad_ProcessLoads = 0x8000FF9C;
func_8000FFCC = 0x8000FFCC; AudioLoad_Init = 0x8000FFCC;
func_800105EC = 0x800105EC; AudioLoad_SlowLoadSample = 0x800105EC;
func_8001079C = 0x8001079C; AudioLoad_GetFontSample = 0x8001079C;
func_80010808 = 0x80010808; AudioLoad_FinishSlowLoad = 0x80010808;
func_80010870 = 0x80010870; AudioLoad_ProcessSlowLoads = 0x80010870;
func_800109FC = 0x800109FC; AudioLoad_DmaSlowCopy = 0x800109FC;
func_80010A80 = 0x80010A80; AudioLoad_DmaSlowCopyUnkMedium = 0x80010A80;
func_80010AD8 = 0x80010AD8; AudioLoad_StartAsyncLoad = 0x80010AD8;
func_80010BF0 = 0x80010BF0; AudioLoad_ProcessAsyncLoads = 0x80010BF0;
func_80010C60 = 0x80010C60; AudioLoad_ProcessAsyncLoad = 0x80010C60;
func_80010EFC = 0x80010EFC; AudioLoad_AsyncDma = 0x80010EFC;
func_80010F8C = 0x80010F8C; AudioLoad_AsyncDmaUnkMedium = 0x80010F8C;
func_80010FE4 = 0x80010FE4; AudioLoad_RelocateSample = 0x80010FE4;
func_80011120 = 0x80011120; AudioLoad_RelocateFontAndPreloadSamples = 0x80011120;
func_8001154C = 0x8001154C; AudioLoad_ProcessSamplePreloads = 0x8001154C;
func_80011710 = 0x80011710; AudioLoad_AddToSampleSet = 0x80011710;
func_80011758 = 0x80011758; AudioLoad_GetSamplesForFont = 0x80011758;
func_80011890 = 0x80011890; func_80011890 = 0x80011890;
func_80011C58 = 0x80011C58; func_80011C58 = 0x80011C58;
func_80011D10 = 0x80011D10; func_80011D10 = 0x80011D10;
func_80011D4C = 0x80011D4C; Audio_GetInstrument = 0x80011D4C;
func_80011DFC = 0x80011DFC; Audio_GetDrum = 0x80011DFC;
func_80011EB8 = 0x80011EB8; func_80011EB8 = 0x80011EB8;
func_80011F4C = 0x80011F4C; func_80011F4C = 0x80011F4C;
func_80011FA8 = 0x80011FA8; func_80011FA8 = 0x80011FA8;

7
linker_scripts/us/symbol_addrs_engine.txt
View file

@ -2,6 +2,8 @@
D_Timer_800CA238 = 0x800CA238; D_Timer_800CA238 = 0x800CA238;
//fox_std_lib //fox_std_lib
sSmallChars = 0x800D2660;//type:asciz size:42
Graphics_ClearPrintBuffer = 0x80099980; Graphics_ClearPrintBuffer = 0x80099980;
Graphics_Printf = 0x800999D8; Graphics_Printf = 0x800999D8;
Texture_Scroll = 0x80099A2C; Texture_Scroll = 0x80099A2C;
@ -148,6 +150,8 @@ Message_DisplayScrollingText = 0x800C2D3C;
Message_IsPrintingChar = 0x800C2F30; Message_IsPrintingChar = 0x800C2F30;
// fox_bg // fox_bg
D_800C9DBC = 0x800C9DBC;//size:39
D_800C9D94 = 0x800C9D94;//size:39
D_800C9CC4 = 0x800C9CC4; D_800C9CC4 = 0x800C9CC4;
D_800C9CF8 = 0x800C9CF8; D_800C9CF8 = 0x800C9CF8;
@ -325,6 +329,9 @@ func_8006A06C = 0x8006A06C;
func_8006A38C = 0x8006A38C; func_8006A38C = 0x8006A38C;
Object_UpdateAll = 0x8006A3E8; Object_UpdateAll = 0x8006A3E8;
// fox_enmy2
D_800D0DBC = 0x800D0DBC;//size:24
// fox_game // fox_game
D_80161A10 = 0x80161A10; D_80161A10 = 0x80161A10;
D_80161A14 = 0x80161A14; D_80161A14 = 0x80161A14;

2
linker_scripts/us/symbol_addrs_nlib_vars.txt
View file

@ -135,7 +135,7 @@ gDramStack = 0x80281000; //size:0x400 segment:fox_buffers defined:true
gOSYieldData = 0x80281400; //size:0xC00 segment:fox_buffers defined:true gOSYieldData = 0x80281400; //size:0xC00 segment:fox_buffers defined:true
gZBuffer = 0x80282000; //size:0x25800 segment:fox_buffers defined:true gZBuffer = 0x80282000; //size:0x25800 segment:fox_buffers defined:true
gTaskOutputBuffer = 0x802A7800; //size:0x30000 name_end:gTaskOutputBufferEnd segment:fox_buffers defined:true gTaskOutputBuffer = 0x802A7800; //size:0x30000 name_end:gTaskOutputBufferEnd segment:fox_buffers defined:true
gAudioDataBuffer = 0x802D7800; //size:0xB0000 segment:fox_buffers defined:true gAudioHeap = 0x802D7800; //size:0xB0000 segment:fox_buffers defined:true
gTextureRenderBuffer = 0x80387800; //size:0x7880 segment:fox_buffers defined:true gTextureRenderBuffer = 0x80387800; //size:0x7880 segment:fox_buffers defined:true
gFillBuffer = 0x8038F080; //size:0x780 segment:fox_buffers defined:true gFillBuffer = 0x8038F080; //size:0x780 segment:fox_buffers defined:true
gFrameBuffers = 0x8038F800; //size:0x70800 segment:fox_buffers defined:true gFrameBuffers = 0x8038F800; //size:0x70800 segment:fox_buffers defined:true

3
linker_scripts/us/symbol_addrs_overlays.txt
View file

@ -22,7 +22,7 @@ func_i2_80187B08 = 0x80187B08;//segment:ovl_i2
func_i2_80188A40 = 0x80188A40;//segment:ovl_i2 func_i2_80188A40 = 0x80188A40;//segment:ovl_i2
D_i2_80195D70 = 0x80195D70;//segment:ovl_i2 D_i2_80195D70 = 0x80195D70;//segment:ovl_i2
D_i4_8019F168 = 0x8019F168; // type:Vec3f segment:ovl_i4 D_i4_8019F168 = 0x8019F168; // type:Vec3f segment:ovl_i4
D_i4_8019F18C = 0x8019F18C; // type:f32 segment:ovl_i4 D_i4_8019F18C = 0x8019F18C; // type:f32 size:0xC segment:ovl_i4
D_i4_8019F198 = 0x8019F198; // type:u8 size:0x28 segment:ovl_i4 force_migration:True D_i4_8019F198 = 0x8019F198; // type:u8 size:0x28 segment:ovl_i4 force_migration:True
D_i4_8019F1C0 = 0x8019F1C0; // type:s32 size:0xA0 segment:ovl_i4 force_migration:True D_i4_8019F1C0 = 0x8019F1C0; // type:s32 size:0xA0 segment:ovl_i4 force_migration:True
D_i4_8019F260 = 0x8019F260; // type:f32 segment:ovl_i4 force_migration:True D_i4_8019F260 = 0x8019F260; // type:f32 segment:ovl_i4 force_migration:True
@ -144,6 +144,7 @@ func_i5_801A6134 = 0x801A6134;//segment:ovl_i5
func_i5_801A65E0 = 0x801A65E0;//segment:ovl_i5 func_i5_801A65E0 = 0x801A65E0;//segment:ovl_i5
func_i5_801A7D98 = 0x801A7D98;//segment:ovl_i5 func_i5_801A7D98 = 0x801A7D98;//segment:ovl_i5
func_i5_801B6E20 = 0x801B6E20;//segment:ovl_i5 func_i5_801B6E20 = 0x801B6E20;//segment:ovl_i5
D_i5_801B74F0 = 0x801B74F0;//segment:ovl_i5 size:28
D_i5_801B7584 = 0x801B7584;//segment:ovl_i5 D_i5_801B7584 = 0x801B7584;//segment:ovl_i5
D_i5_801B7608 = 0x801B7608;//segment:ovl_i5 D_i5_801B7608 = 0x801B7608;//segment:ovl_i5
D_i5_801B769C = 0x801B769C;//segment:ovl_i5 D_i5_801B769C = 0x801B769C;//segment:ovl_i5

1
src/main/audio_general.c
View file

@ -1,5 +1,6 @@
#include "sys.h" #include "sys.h"
#include "sf64audio_provisional.h" #include "sf64audio_provisional.h"
#include "context.h"
void func_80016A50(void) { void func_80016A50(void) {
} }

692
src/main/audio_heap.c
View file

@ -1,11 +1,11 @@
#include "sys.h" #include "sys.h"
#include "sf64audio_provisional.h" #include "sf64audio_provisional.h"
void func_8000DFFC(SampleCacheEntry* entry); void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry);
void func_8000D4A8(void); void AudioHeap_Init(void);
void func_8000E290(void); void AudioHeap_DiscardSampleCaches(void);
void func_8000DCD4(u32, u32); void AudioHeap_InitSampleCaches(u32, u32);
void func_8000E1C4(SampleCacheEntry* entry, Sample* sample); void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, Sample* sample);
SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32); SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32);
void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id); void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id);
void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id); void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id);
@ -15,18 +15,18 @@ void AudioHeap_ResetLoadStatus(void) {
s32 i; s32 i;
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (D_8014D3E8[i] != 5) { if (gFontLoadStatus[i] != 5) {
D_8014D3E8[i] = 0; gFontLoadStatus[i] = 0;
} }
} }
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (D_8014D3A8[i] != 5) { if (gSampleFontLoadStatus[i] != 5) {
D_8014D3A8[i] = 0; gSampleFontLoadStatus[i] = 0;
} }
} }
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
if (D_8014D428[i] != 5) { if (gSeqLoadStatus[i] != 5) {
D_8014D428[i] = 0; gSeqLoadStatus[i] = 0;
} }
} }
} }
@ -35,8 +35,8 @@ void AudioHeap_DiscardFont(s32 fontId) {
Note* note; Note* note;
s32 i; s32 i;
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
note = &D_8014E530[i]; note = &gNotes[i];
if (fontId == note->playbackState.fontId) { if (fontId == note->playbackState.fontId) {
if (note->playbackState.unk_04 == 0 && note->playbackState.priority != 0) { if (note->playbackState.unk_04 == 0 && note->playbackState.priority != 0) {
note->playbackState.parentLayer->enabled = false; note->playbackState.parentLayer->enabled = false;
@ -44,7 +44,7 @@ void AudioHeap_DiscardFont(s32 fontId) {
} }
func_80011F4C(note); func_80011F4C(note);
func_80012C40(note); func_80012C40(note);
func_800145BC(&D_801530C0, note); func_800145BC(&gNoteFreeLists.disabled, &note->listItem);
} }
} }
} }
@ -53,8 +53,8 @@ void AudioHeap_DiscardSequence(s32 seqId) {
s32 i; s32 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (D_8014E538[i].enabled && D_8014E538[i].seqId == seqId) { if (gSeqPlayers[i].enabled && gSeqPlayers[i].seqId == seqId) {
func_800144E4(&D_8014E538[i]); func_800144E4(&gSeqPlayers[i]);
} }
} }
} }
@ -116,49 +116,49 @@ void AudioHeap_ResetPool(AudioAllocPool* pool) {
pool->curRamAddr = pool->startRamAddr; pool->curRamAddr = pool->startRamAddr;
} }
void func_8000BFE8(s32 arg0) { void AudioHeap_InitMainPools(s32 initPoolSize) {
AudioHeap_InitPool(&D_8014C1D0, gAudioDataBuffer, arg0); AudioHeap_InitPool(&gInitPool, gAudioHeap, initPoolSize);
AudioHeap_InitPool(&D_8014C1C0, &gAudioDataBuffer[arg0], D_800C7C30 - arg0); AudioHeap_InitPool(&gSessionPool, gAudioHeap + initPoolSize, gAudioHeapSize - initPoolSize);
} }
void func_8000C044(AudioSessionPoolSplit* split) { void AudioHeap_InitSessionPools(AudioSessionPoolSplit* split) {
D_8014C1C0.curRamAddr = D_8014C1C0.startRamAddr; gSessionPool.curRamAddr = gSessionPool.startRamAddr;
AudioHeap_InitPool(&D_8014C1E0, AudioHeap_Alloc(&D_8014C1C0, split->miscPoolSize), split->miscPoolSize); AudioHeap_InitPool(&gMiscPool, AudioHeap_Alloc(&gSessionPool, split->miscPoolSize), split->miscPoolSize);
AudioHeap_InitPool(&D_8014C210, AudioHeap_Alloc(&D_8014C1C0, split->cachePoolSize), split->cachePoolSize); AudioHeap_InitPool(&gCachePool, AudioHeap_Alloc(&gSessionPool, split->cachePoolSize), split->cachePoolSize);
} }
void func_8000C0C0(AudioCachePoolSplit* split) { void AudioHeap_InitCachePools(AudioCachePoolSplit* split) {
D_8014C210.curRamAddr = D_8014C210.startRamAddr; gCachePool.curRamAddr = gCachePool.startRamAddr;
AudioHeap_InitPool(&D_8014C220, AudioHeap_Alloc(&D_8014C210, split->persistentCommonPoolSize), AudioHeap_InitPool(&gPersistentCommonPool, AudioHeap_Alloc(&gCachePool, split->persistentCommonPoolSize),
split->persistentCommonPoolSize); split->persistentCommonPoolSize);
AudioHeap_InitPool(&D_8014C230, AudioHeap_Alloc(&D_8014C210, split->temporaryCommonPoolSize), AudioHeap_InitPool(&gTemporaryCommonPool, AudioHeap_Alloc(&gCachePool, split->temporaryCommonPoolSize),
split->temporaryCommonPoolSize); split->temporaryCommonPoolSize);
} }
void func_8000C13C(AudioCommonPoolSplit* split) { void AudioHeap_InitPersistentPoolsAndCaches(AudioCommonPoolSplit* split) {
D_8014C220.curRamAddr = D_8014C220.startRamAddr; gPersistentCommonPool.curRamAddr = gPersistentCommonPool.startRamAddr;
AudioHeap_InitPool(&D_8014C240.persistent.pool, AudioHeap_Alloc(&D_8014C220, split->seqCacheSize), AudioHeap_InitPool(&gSeqCache.persistent.pool, AudioHeap_Alloc(&gPersistentCommonPool, split->seqCacheSize),
split->seqCacheSize); split->seqCacheSize);
AudioHeap_InitPool(&D_8014C410.persistent.pool, AudioHeap_Alloc(&D_8014C220, split->fontCacheSize), AudioHeap_InitPool(&gFontCache.persistent.pool, AudioHeap_Alloc(&gPersistentCommonPool, split->fontCacheSize),
split->fontCacheSize); split->fontCacheSize);
AudioHeap_InitPool(&D_8014C5E0.persistent.pool, AudioHeap_Alloc(&D_8014C220, split->sampleBankCacheSize), AudioHeap_InitPool(&gSampleBankCache.persistent.pool,
split->sampleBankCacheSize); AudioHeap_Alloc(&gPersistentCommonPool, split->sampleBankCacheSize), split->sampleBankCacheSize);
AudioHeap_InitPersistentCache(&D_8014C240.persistent); AudioHeap_InitPersistentCache(&gSeqCache.persistent);
AudioHeap_InitPersistentCache(&D_8014C410.persistent); AudioHeap_InitPersistentCache(&gFontCache.persistent);
AudioHeap_InitPersistentCache(&D_8014C5E0.persistent); AudioHeap_InitPersistentCache(&gSampleBankCache.persistent);
} }
void func_8000C1F8(AudioCommonPoolSplit* split) { void AudioHeap_InitTemporaryPoolsAndCaches(AudioCommonPoolSplit* split) {
D_8014C230.curRamAddr = D_8014C230.startRamAddr; gTemporaryCommonPool.curRamAddr = gTemporaryCommonPool.startRamAddr;
AudioHeap_InitPool(&D_8014C240.temporary.pool, AudioHeap_Alloc(&D_8014C230, split->seqCacheSize), AudioHeap_InitPool(&gSeqCache.temporary.pool, AudioHeap_Alloc(&gTemporaryCommonPool, split->seqCacheSize),
split->seqCacheSize); split->seqCacheSize);
AudioHeap_InitPool(&D_8014C410.temporary.pool, AudioHeap_Alloc(&D_8014C230, split->fontCacheSize), AudioHeap_InitPool(&gFontCache.temporary.pool, AudioHeap_Alloc(&gTemporaryCommonPool, split->fontCacheSize),
split->fontCacheSize); split->fontCacheSize);
AudioHeap_InitPool(&D_8014C5E0.temporary.pool, AudioHeap_Alloc(&D_8014C230, split->sampleBankCacheSize), AudioHeap_InitPool(&gSampleBankCache.temporary.pool,
split->sampleBankCacheSize); AudioHeap_Alloc(&gTemporaryCommonPool, split->sampleBankCacheSize), split->sampleBankCacheSize);
AudioHeap_InitTemporaryCache(&D_8014C240.temporary); AudioHeap_InitTemporaryCache(&gSeqCache.temporary);
AudioHeap_InitTemporaryCache(&D_8014C410.temporary); AudioHeap_InitTemporaryCache(&gFontCache.temporary);
AudioHeap_InitTemporaryCache(&D_8014C5E0.temporary); AudioHeap_InitTemporaryCache(&gSampleBankCache.temporary);
} }
void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) { void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
@ -174,16 +174,16 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
switch (tableType) { switch (tableType) {
case 0: case 0:
loadedCache = &D_8014C240; loadedCache = &gSeqCache;
loadStatus = D_8014D428; loadStatus = gSeqLoadStatus;
break; break;
case 1: case 1:
loadedCache = &D_8014C410; loadedCache = &gFontCache;
loadStatus = D_8014D3E8; loadStatus = gFontLoadStatus;
break; break;
case 2: case 2:
loadedCache = &D_8014C5E0; loadedCache = &gSampleBankCache;
loadStatus = D_8014D3A8; loadStatus = gSampleFontLoadStatus;
break; break;
} }
if (cache == 0) { if (cache == 0) {
@ -201,29 +201,29 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
} }
if (tableType == 1) { if (tableType == 1) {
if (loadStatusEntry0 == 4) { if (loadStatusEntry0 == 4) {
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
if ((D_8014E530[i].playbackState.fontId == temporaryCache->entries[0].id) && if ((gNotes[i].playbackState.fontId == temporaryCache->entries[0].id) &&
D_8014E530[i].noteSubEu.bitField0.enabled) { gNotes[i].noteSubEu.bitField0.enabled) {
break; break;
} }
} }
if (i == D_80155CA0) { if (i == gNumNotes) {
if (D_8014D3E8[temporaryCache->entries[0].id] != 5) { if (gFontLoadStatus[temporaryCache->entries[0].id] != 5) {
D_8014D3E8[temporaryCache->entries[0].id] = 3; gFontLoadStatus[temporaryCache->entries[0].id] = 3;
} }
loadStatusEntry0 = 3; loadStatusEntry0 = 3;
} }
} }
if (loadStatusEntry1 == 4) { if (loadStatusEntry1 == 4) {
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
if ((D_8014E530[i].playbackState.fontId == temporaryCache->entries[1].id) && if ((gNotes[i].playbackState.fontId == temporaryCache->entries[1].id) &&
D_8014E530[i].noteSubEu.bitField0.enabled) { gNotes[i].noteSubEu.bitField0.enabled) {
break; break;
} }
} }
if (i == D_80155CA0) { if (i == gNumNotes) {
if (D_8014D3E8[temporaryCache->entries[1].id] != 5) { if (gFontLoadStatus[temporaryCache->entries[1].id] != 5) {
D_8014D3E8[temporaryCache->entries[1].id] = 3; gFontLoadStatus[temporaryCache->entries[1].id] = 3;
} }
loadStatusEntry1 = 3; loadStatusEntry1 = 3;
} }
@ -244,7 +244,7 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
if (tableType == 0) { if (tableType == 0) {
if (loadStatusEntry0 == 2) { if (loadStatusEntry0 == 2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (D_8014E538[i].enabled && (D_8014E538[i].seqId == temporaryCache->entries[0].id)) { if (gSeqPlayers[i].enabled && (gSeqPlayers[i].seqId == temporaryCache->entries[0].id)) {
break; break;
} }
} }
@ -255,7 +255,7 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
} }
if (loadStatusEntry1 == 2) { if (loadStatusEntry1 == 2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (D_8014E538[i].enabled && (D_8014E538[i].seqId == temporaryCache->entries[1].id)) { if (gSeqPlayers[i].enabled && (gSeqPlayers[i].seqId == temporaryCache->entries[1].id)) {
break; break;
} }
} }
@ -266,26 +266,26 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
} }
} else if (tableType == 1) { } else if (tableType == 1) {
if (loadStatusEntry0 == 2) { if (loadStatusEntry0 == 2) {
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
if ((D_8014E530[i].playbackState.fontId == temporaryCache->entries[0].id) && if ((gNotes[i].playbackState.fontId == temporaryCache->entries[0].id) &&
D_8014E530[i].noteSubEu.bitField0.enabled) { gNotes[i].noteSubEu.bitField0.enabled) {
break; break;
} }
} }
if (i == D_80155CA0) { if (i == gNumNotes) {
temporaryCache->nextSide = 0; temporaryCache->nextSide = 0;
goto block_85; goto block_85;
} }
} }
if (loadStatusEntry1 == 2) { if (loadStatusEntry1 == 2) {
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
if ((D_8014E530[i].playbackState.fontId == temporaryCache->entries[1].id) && if ((gNotes[i].playbackState.fontId == temporaryCache->entries[1].id) &&
D_8014E530[i].noteSubEu.bitField0.enabled) { gNotes[i].noteSubEu.bitField0.enabled) {
break; break;
} }
} }
if (i == D_80155CA0) { if (i == gNumNotes) {
temporaryCache->nextSide = 1; temporaryCache->nextSide = 1;
goto block_85; goto block_85;
} }
@ -344,7 +344,7 @@ void* AudioHeap_AllocCached(s32 tableType, s32 size, s32 cache, s32 id) {
break; break;
case 1: case 1:
temporaryCache->entries[1].ramAddr = temporaryCache->entries[1].ramAddr =
(u8*) (((u32) &temporaryPool->startRamAddr[temporaryPool->size] - size) & ~0xF); (((u32) &temporaryPool->startRamAddr[temporaryPool->size] - size) & ~0xF);
temporaryCache->entries[1].id = id; temporaryCache->entries[1].id = id;
temporaryCache->entries[1].size = size; temporaryCache->entries[1].size = size;
if ((temporaryCache->entries[0].id != -1) && if ((temporaryCache->entries[0].id != -1) &&
@ -407,15 +407,15 @@ void* AudioHeap_SearchRegularCaches(s32 tableType, s32 cache, s32 id) {
switch (tableType) { switch (tableType) {
case SEQUENCE_TABLE: case SEQUENCE_TABLE:
loadedCache = (AudioCache*) &D_8014C240; loadedCache = (AudioCache*) &gSeqCache;
break; break;
case FONT_TABLE: case FONT_TABLE:
loadedCache = (AudioCache*) &D_8014C410; loadedCache = (AudioCache*) &gFontCache;
break; break;
case SAMPLE_TABLE: case SAMPLE_TABLE:
loadedCache = (AudioCache*) &D_8014C5E0; loadedCache = (AudioCache*) &gSampleBankCache;
break; break;
} }
@ -473,248 +473,248 @@ void func_8000CAF4(f32 p, f32 q, u16* out) {
} }
} }
void func_8000CEC8(void) { void AudioHeap_UpdateReverbs(void) {
s32 var_a1; s32 i;
s32 var_v0; s32 count;
s32 var_v1; s32 reverbIndex;
if (D_80155C78.specUnk4 == 2) { if (gAudioBufferParams.specUnk4 == 2) {
var_v0 = 2; count = 2;
} else { } else {
var_v0 = 1; count = 1;
} }
for (var_v1 = 0; var_v1 < D_8014C1B3; var_v1++) { for (reverbIndex = 0; reverbIndex < gNumSynthReverbs; reverbIndex++) {
for (var_a1 = 0; var_a1 < var_v0; var_a1++) { for (i = 0; i < count; i++) {
D_8014BA50[var_v1].unk_08 -= D_8014BA50[var_v1].unk_08 / 3; gSynthReverbs[reverbIndex].unk_08 -= gSynthReverbs[reverbIndex].unk_08 / 3;
} }
} }
} }
void func_8000D08C(void) { void AudioHeap_ClearCurrentAiBuffer(void) {
s32 i; s32 i;
s32 var_a1 = D_80155CB4; s32 index = gCurAiBuffIndex;
D_80155D7C[var_a1] = D_80155C78.minAiBufferLength; gAiBuffLengths[index] = gAudioBufferParams.minAiBufferLength;
for (i = 0; i < 0xAA0; i++) { for (i = 0; i < 0xAA0; i++) {
D_80155D70[var_a1][i] = 0; gAiBuffers[index][i] = 0;
} }
} }
s32 func_8000D104(void) { s32 AudioHeap_ResetStep(void) {
s32 i; s32 i;
s32 j; s32 j;
s32 sp24; s32 sp24;
if (D_80155C78.specUnk4 == 2) { if (gAudioBufferParams.specUnk4 == 2) {
sp24 = 2; sp24 = 2;
} else { } else {
sp24 = 1; sp24 = 1;
} }
switch (D_8014D528) { switch (gResetStatus) {
case 5: case 5:
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
func_800144E4(&D_8014E538[i]); func_800144E4(&gSeqPlayers[i]);
} }
D_8014D52C = 4 / sp24; gResetFadeoutFramesLeft = 4 / sp24;
D_8014D528--; gResetStatus--;
break; break;
case 4: case 4:
if (D_8014D52C != 0) { if (gResetFadeoutFramesLeft != 0) {
D_8014D52C--; gResetFadeoutFramesLeft--;
func_8000CEC8(); AudioHeap_UpdateReverbs();
} else { } else {
for (i = 0; i < D_80155CA0; i++) { for (i = 0; i < gNumNotes; i++) {
if (D_8014E530[i].noteSubEu.bitField0.enabled && (D_8014E530[i].playbackState.adsr.state != 0)) { if (gNotes[i].noteSubEu.bitField0.enabled && (gNotes[i].playbackState.adsr.state != 0)) {
D_8014E530[i].playbackState.adsr.fadeOutVel = D_80155C78.ticksPerUpdateInv; gNotes[i].playbackState.adsr.fadeOutVel = gAudioBufferParams.ticksPerUpdateInv;
D_8014E530[i].playbackState.adsr.action.asByte |= 0x10; gNotes[i].playbackState.adsr.action.asByte |= 0x10;
} }
} }
D_8014D52C = 0x10 / sp24; gResetFadeoutFramesLeft = 0x10 / sp24;
D_8014D528--; gResetStatus--;
} }
break; break;
case 3: case 3:
if (D_8014D52C != 0) { if (gResetFadeoutFramesLeft != 0) {
D_8014D52C--; gResetFadeoutFramesLeft--;
func_8000CEC8(); AudioHeap_UpdateReverbs();
} else { } else {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 0xAA0; j++) { for (j = 0; j < 0xAA0; j++) {
D_80155D70[i][j] = 0; gAiBuffers[i][j] = 0;
} }
} }
D_8014D52C = 4 / sp24; gResetFadeoutFramesLeft = 4 / sp24;
D_8014D528--; gResetStatus--;
break; // needed to match break; // needed to match
} }
break; break;
case 2: case 2:
func_8000D08C(); AudioHeap_ClearCurrentAiBuffer();
if (D_8014D52C != 0) { if (gResetFadeoutFramesLeft != 0) {
D_8014D52C--; gResetFadeoutFramesLeft--;
} else { } else {
D_8014D528--; gResetStatus--;
func_8000E290(); AudioHeap_DiscardSampleCaches();
} }
break; break;
case 1: case 1:
func_8000D4A8(); AudioHeap_Init();
D_8014D528 = 0; gResetStatus = 0;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
D_80155D7C[i] = D_80155C78.maxAiBufferLength; gAiBuffLengths[i] = gAudioBufferParams.maxAiBufferLength;
for (j = 0; j < 0xAA0; j++) { for (j = 0; j < 0xAA0; j++) {
D_80155D70[i][j] = 0; gAiBuffers[i][j] = 0;
} }
} }
break; break;
} }
if (D_8014D528 < 3) { if (gResetStatus < 3) {
return 0; return 0;
} }
return 1; return 1;
} }
void func_8000D4A8(void) { void AudioHeap_Init(void) {
s32 i; s32 i;
s32 j; s32 j;
AudioSpec* spec = &D_800C76B8[D_8014D529]; AudioSpec* spec = &gAudioSpecs[gAudioSpecId];
ReverbSettings* temp_v0_2; ReverbSettings* settings;
SynthesisReverb* temp; SynthesisReverb* reverb;
s16* temp_v0_3; s16* ramAddr;
u32 temp_s0; u32 persistentSize;
u32 temp_s1; u32 temporarySize;
u32 temp_v0; u32 cachePoolSize;
u32 temp_v1; u32 miscPoolSize;
D_80155A48 = 0; gSampleDmaCount = 0;
D_80155C78.samplingFrequency = spec->samplingFrequency; gAudioBufferParams.samplingFrequency = spec->samplingFrequency;
D_80155C78.aiSamplingFrequency = osAiSetFrequency(D_80155C78.samplingFrequency); gAudioBufferParams.aiSamplingFrequency = osAiSetFrequency(gAudioBufferParams.samplingFrequency);
D_80155C78.samplesPerFrameTarget = ((D_80155C78.samplingFrequency / D_80155D6C) + 0xF) & (u16) ~0xF; gAudioBufferParams.samplesPerFrameTarget =
((gAudioBufferParams.samplingFrequency / gRefreshRate) + 0xF) & (u16) ~0xF;
D_80155C78.minAiBufferLength = D_80155C78.samplesPerFrameTarget - 0x10; gAudioBufferParams.minAiBufferLength = gAudioBufferParams.samplesPerFrameTarget - 0x10;
D_80155C78.maxAiBufferLength = D_80155C78.samplesPerFrameTarget + 0x10; gAudioBufferParams.maxAiBufferLength = gAudioBufferParams.samplesPerFrameTarget + 0x10;
D_80155C78.ticksPerUpdate = ((D_80155C78.samplesPerFrameTarget + 0x10) / 192) + 1; gAudioBufferParams.ticksPerUpdate = ((gAudioBufferParams.samplesPerFrameTarget + 0x10) / 192) + 1;
D_80155C78.samplesPerTick = (D_80155C78.samplesPerFrameTarget / D_80155C78.ticksPerUpdate) & ~7; gAudioBufferParams.samplesPerTick =
D_80155C78.samplesPerTickMax = D_80155C78.samplesPerTick + 8; (gAudioBufferParams.samplesPerFrameTarget / gAudioBufferParams.ticksPerUpdate) & ~7;
D_80155C78.samplesPerTickMin = D_80155C78.samplesPerTick - 8; gAudioBufferParams.samplesPerTickMax = gAudioBufferParams.samplesPerTick + 8;
D_80155C78.resampleRate = 32000.0f / (s32) D_80155C78.samplingFrequency; gAudioBufferParams.samplesPerTickMin = gAudioBufferParams.samplesPerTick - 8;
D_80155C78.ticksPerUpdateInvScaled = 0.001171875f / D_80155C78.ticksPerUpdate; gAudioBufferParams.resampleRate = 32000.0f / (s32) gAudioBufferParams.samplingFrequency;
D_80155C78.ticksPerUpdateInv = 1.0f / D_80155C78.ticksPerUpdate; gAudioBufferParams.ticksPerUpdateInvScaled = 0.001171875f / gAudioBufferParams.ticksPerUpdate;
D_80155CA0 = spec->numNotes; gAudioBufferParams.ticksPerUpdateInv = 1.0f / gAudioBufferParams.ticksPerUpdate;
gNumNotes = spec->numNotes;
D_8014C1B0 = spec->unk_14; D_8014C1B0 = spec->unk_14;
D_80155CA4 = (D_80155C78.ticksPerUpdate * 2880000.0f / D_800C7C2C) / D_80155D68; gMaxTempo = (gAudioBufferParams.ticksPerUpdate * 2880000.0f / gSeqTicksPerBeat) / gMaxTempoTvTypeFactors;
D_80155C78.specUnk4 = spec->unk_04; gAudioBufferParams.specUnk4 = spec->unk_04;
D_80155C78.samplesPerFrameTarget *= D_80155C78.specUnk4; gAudioBufferParams.samplesPerFrameTarget *= gAudioBufferParams.specUnk4;
D_80155C78.maxAiBufferLength *= D_80155C78.specUnk4; gAudioBufferParams.maxAiBufferLength *= gAudioBufferParams.specUnk4;
D_80155C78.minAiBufferLength *= D_80155C78.specUnk4; gAudioBufferParams.minAiBufferLength *= gAudioBufferParams.specUnk4;
D_80155C78.ticksPerUpdate *= D_80155C78.specUnk4; gAudioBufferParams.ticksPerUpdate *= gAudioBufferParams.specUnk4;
if (D_80155C78.specUnk4 >= 2) { if (gAudioBufferParams.specUnk4 >= 2) {
D_80155C78.maxAiBufferLength -= 0x10; gAudioBufferParams.maxAiBufferLength -= 0x10;
} }
D_80155C9C = (D_80155CA0 * 0x14 * D_80155C78.ticksPerUpdate) + (spec->numReverbs * 0x20) + 0x1E0; gMaxAudioCmds = (gNumNotes * 0x14 * gAudioBufferParams.ticksPerUpdate) + (spec->numReverbs * 0x20) + 0x1E0;
temp_s0 = spec->persistentSeqCacheSize + spec->persistentFontCacheSize + spec->persistentSampleBankCacheSize + persistentSize = spec->persistentSeqCacheSize + spec->persistentFontCacheSize +
spec->persistentSampleCacheSize + 0x10; spec->persistentSampleBankCacheSize + spec->persistentSampleCacheSize + 0x10;
temp_s1 = spec->temporarySeqCacheSize + spec->temporaryFontCacheSize + spec->temporarySampleBankCacheSize + temporarySize = spec->temporarySeqCacheSize + spec->temporaryFontCacheSize + spec->temporarySampleBankCacheSize +
spec->temporarySampleCacheSize + 0x10; spec->temporarySampleCacheSize + 0x10;
temp_v0 = temp_s0 + temp_s1; cachePoolSize = persistentSize + temporarySize;
temp_v1 = D_8014C1C0.size - (temp_v0 + 0x100); miscPoolSize = gSessionPool.size - cachePoolSize - 0x100;
D_8014D370.miscPoolSize = temp_v1; gSessionPoolSplit.miscPoolSize = miscPoolSize;
D_8014D370.cachePoolSize = temp_v0; gSessionPoolSplit.cachePoolSize = cachePoolSize;
func_8000C044(&D_8014D370); AudioHeap_InitSessionPools(&gSessionPoolSplit);
D_8014D380.persistentCommonPoolSize = temp_s0; gCachePoolSplit.persistentCommonPoolSize = persistentSize;
D_8014D380.temporaryCommonPoolSize = temp_s1; gCachePoolSplit.temporaryCommonPoolSize = temporarySize;
func_8000C0C0(&D_8014D380); AudioHeap_InitCachePools(&gCachePoolSplit);
D_8014D388.seqCacheSize = spec->persistentSeqCacheSize; gPersistentCommonPoolSplit.seqCacheSize = spec->persistentSeqCacheSize;
D_8014D388.fontCacheSize = spec->persistentFontCacheSize; gPersistentCommonPoolSplit.fontCacheSize = spec->persistentFontCacheSize;
D_8014D388.sampleBankCacheSize = spec->persistentSampleBankCacheSize; gPersistentCommonPoolSplit.sampleBankCacheSize = spec->persistentSampleBankCacheSize;
func_8000C13C(&D_8014D388); AudioHeap_InitPersistentPoolsAndCaches(&gPersistentCommonPoolSplit);
D_8014D398.seqCacheSize = spec->temporarySeqCacheSize; gTemporaryCommonPoolSplit.seqCacheSize = spec->temporarySeqCacheSize;
D_8014D398.fontCacheSize = spec->temporaryFontCacheSize; gTemporaryCommonPoolSplit.fontCacheSize = spec->temporaryFontCacheSize;
D_8014D398.sampleBankCacheSize = spec->temporarySampleBankCacheSize; gTemporaryCommonPoolSplit.sampleBankCacheSize = spec->temporarySampleBankCacheSize;
func_8000C1F8(&D_8014D398); AudioHeap_InitTemporaryPoolsAndCaches(&gTemporaryCommonPoolSplit);
func_8000DCD4(spec->persistentSampleCacheSize, spec->temporarySampleCacheSize); AudioHeap_InitSampleCaches(spec->persistentSampleCacheSize, spec->temporarySampleCacheSize);
AudioHeap_ResetLoadStatus(); AudioHeap_ResetLoadStatus();
D_8014E530 = AudioHeap_AllocZeroed(&D_8014C1E0, D_80155CA0 * sizeof(Note)); gNotes = AudioHeap_AllocZeroed(&gMiscPool, gNumNotes * sizeof(Note));
func_800132E8(); func_800132E8();
func_800128B4(); func_800128B4();
D_8014C1B8 = AudioHeap_AllocZeroed(&D_8014C1E0, D_80155C78.ticksPerUpdate * D_80155CA0 * sizeof(NoteSubEu)); gNoteSubsEu = AudioHeap_AllocZeroed(&gMiscPool, gAudioBufferParams.ticksPerUpdate * gNumNotes * sizeof(NoteSubEu));
for (i = 0; i != 2; i++) { for (i = 0; i != 2; i++) {
D_80155CB8[i] = AudioHeap_AllocZeroed(&D_8014C1E0, D_80155C9C * 8); gAbiCmdBuffs[i] = AudioHeap_AllocZeroed(&gMiscPool, gMaxAudioCmds * 8);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
D_8014BA50[i].useReverb = 0; gSynthReverbs[i].useReverb = 0;
} }
D_8014C1B3 = spec->numReverbs; gNumSynthReverbs = spec->numReverbs;
for (i = 0; i < D_8014C1B3; i++) { for (i = 0; i < gNumSynthReverbs; i++) {
temp_v0_2 = &spec->reverbSettings[i]; settings = &spec->reverbSettings[i];
temp = &D_8014BA50[i]; reverb = &gSynthReverbs[i];
temp->downsampleRate = temp_v0_2->downsampleRate; reverb->downsampleRate = settings->downsampleRate;
temp->windowSize = temp_v0_2->windowSize * 64; reverb->windowSize = settings->windowSize * 64;
temp->unk_08 = temp_v0_2->unk_2; reverb->unk_08 = settings->unk_2;
temp->decayRatio = temp_v0_2->decayRatio; reverb->decayRatio = settings->decayRatio;
temp->unk_0E = temp_v0_2->unk_6; reverb->unk_0E = settings->unk_6;
temp->useReverb = 8; reverb->useReverb = 8;
temp->leftRingBuf = AudioHeap_AllocZeroed(&D_8014C1E0, temp->windowSize * 2); reverb->leftRingBuf = AudioHeap_AllocZeroed(&gMiscPool, reverb->windowSize * 2);
temp->rightRingBuf = AudioHeap_AllocZeroed(&D_8014C1E0, temp->windowSize * 2); reverb->rightRingBuf = AudioHeap_AllocZeroed(&gMiscPool, reverb->windowSize * 2);
temp->nextRingBufPos = 0; reverb->nextRingBufPos = 0;
temp->unk_20 = 0; reverb->unk_20 = 0;
temp->curFrame = 0; reverb->curFrame = 0;
temp->bufSizePerChan = temp->windowSize; reverb->bufSizePerChan = reverb->windowSize;
temp->framesToIgnore = 2; reverb->framesToIgnore = 2;
if (temp->downsampleRate != 1) { if (reverb->downsampleRate != 1) {
temp->resampleFlags = 1; reverb->resampleFlags = 1;
temp->unk_0A = (0x8000 / temp->downsampleRate); reverb->unk_0A = (0x8000 / reverb->downsampleRate);
temp->unk_30 = AudioHeap_AllocZeroed(&D_8014C1E0, 0x20); reverb->unk_30 = AudioHeap_AllocZeroed(&gMiscPool, 0x20);
temp->unk_34 = AudioHeap_AllocZeroed(&D_8014C1E0, 0x20); reverb->unk_34 = AudioHeap_AllocZeroed(&gMiscPool, 0x20);
temp->unk_38 = AudioHeap_AllocZeroed(&D_8014C1E0, 0x20); reverb->unk_38 = AudioHeap_AllocZeroed(&gMiscPool, 0x20);
temp->unk_3C = AudioHeap_AllocZeroed(&D_8014C1E0, 0x20); reverb->unk_3C = AudioHeap_AllocZeroed(&gMiscPool, 0x20);
for (j = 0; j < D_80155C78.ticksPerUpdate; j++) { for (j = 0; j < gAudioBufferParams.ticksPerUpdate; j++) {
temp_v0_3 = AudioHeap_AllocZeroed(&D_8014C1E0, 0x300); ramAddr = AudioHeap_AllocZeroed(&gMiscPool, 0x300);
temp->items[0][j].toDownsampleLeft = temp_v0_3; reverb->items[0][j].toDownsampleLeft = ramAddr;
temp->items[0][j].toDownsampleRight = temp_v0_3 + 192; reverb->items[0][j].toDownsampleRight = ramAddr + 192;
temp_v0_3 = AudioHeap_AllocZeroed(&D_8014C1E0, 0x300); ramAddr = AudioHeap_AllocZeroed(&gMiscPool, 0x300);
temp->items[1][j].toDownsampleLeft = temp_v0_3; reverb->items[1][j].toDownsampleLeft = ramAddr;
temp->items[1][j].toDownsampleRight = temp_v0_3 + 192; reverb->items[1][j].toDownsampleRight = ramAddr + 192;
} }
} }
} }
func_8000E8E0(D_80155CA0); AudioLoad_InitSampleDmaBuffers(gNumNotes);
D_80153D04 = 0; gPreloadSampleStackTop = 0;
D_8014C1B4 = 0x1000; D_8014C1B4 = 0x1000;
osWritebackDCacheAll(); osWritebackDCacheAll();
} }
void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id) { void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id) {
s32 i; s32 i;
AudioAllocPool* var_a1;
s32 var_v0;
for (i = 0; i < D_8014C7B0.pool.numEntries; i++) { for (i = 0; i < gPermanentPool.pool.numEntries; i++) {
if ((tableType == D_8014C7B0.entry[i].tableType) && (id == D_8014C7B0.entry[i].id)) { if ((tableType == gPermanentPool.entry[i].tableType) && (id == gPermanentPool.entry[i].id)) {
return D_8014C7B0.entry[i].ramAddr; return gPermanentPool.entry[i].ramAddr;
} }
} }
return NULL; return NULL;
} }
u8* func_8000DB64(s32 arg0, s32 arg1, u32 arg2) { u8* AudioHeap_AllocPermanent(s32 tableType, s32 id, u32 size) {
u8* temp; u8* ramAddr;
s32 sp18 = D_8014C7B0.pool.numEntries; s32 index = gPermanentPool.pool.numEntries;
temp = AudioHeap_Alloc(&D_8014C7B0.pool, arg2); ramAddr = AudioHeap_Alloc(&gPermanentPool.pool, size);
D_8014C7B0.entry[sp18].ramAddr = temp; gPermanentPool.entry[index].ramAddr = ramAddr;
if (temp == NULL) { if (ramAddr == NULL) {
return NULL; return NULL;
} }
D_8014C7B0.entry[sp18].tableType = arg0; gPermanentPool.entry[index].tableType = tableType;
D_8014C7B0.entry[sp18].id = arg1; gPermanentPool.entry[index].id = id;
D_8014C7B0.entry[sp18].size = arg2; gPermanentPool.entry[index].size = size;
// return temp; // return temp;
} }
@ -757,62 +757,62 @@ void* AudioHeap_AllocPersistentSampleCache_2(u32 size, s32 fontId, s32 sampleAdd
} }
} }
void func_8000DCD4(u32 arg0, u32 arg1) { void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize) {
void* temp_v0; void* ramAddr;
temp_v0 = AudioHeap_Alloc(&D_8014C220, arg0); ramAddr = AudioHeap_Alloc(&gPersistentCommonPool, persistentSampleCacheSize);
if (temp_v0 == NULL) { if (ramAddr == NULL) {
D_8014C940.pool.size = 0; gPersistentSampleCache.pool.size = 0;
} else { } else {
AudioHeap_InitPool(&D_8014C940.pool, temp_v0, arg0); AudioHeap_InitPool(&gPersistentSampleCache.pool, ramAddr, persistentSampleCacheSize);
} }
temp_v0 = AudioHeap_Alloc(&D_8014C230, arg1); ramAddr = AudioHeap_Alloc(&gTemporaryCommonPool, temporarySampleCacheSize);
if (temp_v0 == NULL) { if (ramAddr == NULL) {
D_8014CE58.pool.size = 0; gTemporarySampleCache.pool.size = 0;
} else { } else {
AudioHeap_InitPool(&D_8014CE58.pool, temp_v0, arg1); AudioHeap_InitPool(&gTemporarySampleCache.pool, ramAddr, temporarySampleCacheSize);
} }
D_8014C940.numEntries = 0; gPersistentSampleCache.numEntries = 0;
D_8014CE58.numEntries = 0; gTemporarySampleCache.numEntries = 0;
} }
SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32 arg0) { SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32 size) {
u8* temp_a0; u8* endRamAddr;
u8* temp_s0; u8* old;
u8* sp3C; u8* ramAddr;
s32 i; s32 i;
s32 var_s5; s32 entryIdx;
SampleCacheEntry* entry; SampleCacheEntry* entry;
AudioPreloadReq* preload; AudioPreloadReq* preload;
AudioSampleCache* cache; AudioSampleCache* cache;
u8* temp_s2; u8* allocAfter;
u8* temp_v0_3; u8* startRamAddr;
u8* var_s3; u8* allocBefore;
cache = &D_8014CE58; cache = &gTemporarySampleCache;
var_s3 = cache->pool.curRamAddr; allocBefore = cache->pool.curRamAddr;
sp3C = AudioHeap_Alloc(&cache->pool, (u32) arg0); ramAddr = AudioHeap_Alloc(&cache->pool, size);
if (sp3C == NULL) { if (ramAddr == NULL) {
temp_s0 = cache->pool.curRamAddr; old = cache->pool.curRamAddr;
cache->pool.curRamAddr = cache->pool.startRamAddr; cache->pool.curRamAddr = cache->pool.startRamAddr;
sp3C = AudioHeap_Alloc(&cache->pool, (u32) arg0); ramAddr = AudioHeap_Alloc(&cache->pool, size);
if (sp3C == NULL) { if (ramAddr == NULL) {
cache->pool.curRamAddr = temp_s0; cache->pool.curRamAddr = old;
return NULL; return NULL;
} }
var_s3 = cache->pool.startRamAddr; allocBefore = cache->pool.startRamAddr;
} }
temp_s2 = cache->pool.curRamAddr; allocAfter = cache->pool.curRamAddr;
var_s5 = -1; entryIdx = -1;
for (i = 0; i < D_80153D04; i++) { for (i = 0; i < gPreloadSampleStackTop; i++) {
preload = &D_80153300[i]; preload = &gPreloadSampleStack[i];
if (preload->isFree == 0) { if (preload->isFree == 0) {
temp_v0_3 = preload->ramAddr; startRamAddr = preload->ramAddr;
temp_a0 = preload->ramAddr + preload->sample->size - 1; endRamAddr = preload->ramAddr + preload->sample->size - 1;
if ((temp_a0 < var_s3) && (temp_v0_3 < var_s3)) { if ((endRamAddr < allocBefore) && (startRamAddr < allocBefore)) {
continue; continue;
} }
if ((temp_a0 >= temp_s2) && (temp_v0_3 >= temp_s2)) { if ((endRamAddr >= allocAfter) && (startRamAddr >= allocAfter)) {
continue; continue;
} }
preload->isFree = 1; preload->isFree = 1;
@ -822,62 +822,62 @@ SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(s32 arg0) {
if (cache->entries[i].inUse == 0) { if (cache->entries[i].inUse == 0) {
continue; continue;
} }
temp_v0_3 = cache->entries[i].allocatedAddr; startRamAddr = cache->entries[i].allocatedAddr;
temp_a0 = temp_v0_3 + cache->entries[i].size - 1; endRamAddr = startRamAddr + cache->entries[i].size - 1;
if ((temp_a0 < var_s3) && (temp_v0_3 < var_s3)) { if ((endRamAddr < allocBefore) && (startRamAddr < allocBefore)) {
continue; continue;
} }
if ((temp_a0 >= temp_s2) && (temp_v0_3 >= temp_s2)) { if ((endRamAddr >= allocAfter) && (startRamAddr >= allocAfter)) {
continue; continue;
} }
func_8000DFFC(&cache->entries[i]); AudioHeap_DiscardSampleCacheEntry(&cache->entries[i]);
if (var_s5 == -1) { if (entryIdx == -1) {
var_s5 = i; entryIdx = i;
} }
} }
if (var_s5 == -1) { if (entryIdx == -1) {
var_s5 = cache->numEntries++; entryIdx = cache->numEntries++;
} }
entry = &cache->entries[var_s5]; entry = &cache->entries[entryIdx];
entry->inUse = 1; entry->inUse = 1;
entry->allocatedAddr = sp3C; entry->allocatedAddr = ramAddr;
entry->size = arg0; entry->size = size;
return entry; return entry;
} }
void func_8000DFFC(SampleCacheEntry* entry) { void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry) {
s32 i; s32 fondId;
s32 sp40; s32 numFonts;
Drum* temp_v0_3; Drum* drum;
Instrument* temp_v0_2; Instrument* instrument;
s32 var_s1; s32 instId;
s32 var_s2; s32 drumId;
s32 temp_a0; s32 sampleBankId2;
s32 temp_v1; s32 sampleBankId1;
sp40 = D_80155C60->numEntries; numFonts = gSoundFontTable->numEntries;
for (i = 0; i < sp40; i++) { for (fondId = 0; fondId < numFonts; fondId++) {
temp_v1 = D_80155C70[i].sampleBankId1; sampleBankId1 = gSoundFontList[fondId].sampleBankId1;
temp_a0 = D_80155C70[i].sampleBankId2; sampleBankId2 = gSoundFontList[fondId].sampleBankId2;
if (((temp_v1 != 0xFF) && (entry->sampleBankId == temp_v1)) || if (((sampleBankId1 != 0xFF) && (entry->sampleBankId == sampleBankId1)) ||
((temp_a0 != 0xFF) && (entry->sampleBankId == temp_a0)) || (entry->sampleBankId == 0)) { ((sampleBankId2 != 0xFF) && (entry->sampleBankId == sampleBankId2)) || (entry->sampleBankId == 0)) {
if ((AudioHeap_SearchCaches(1, 2, i) != NULL) && ((D_8014D3E8[i] > 1) != 0)) { if ((AudioHeap_SearchCaches(1, 2, fondId) != NULL) && ((gFontLoadStatus[fondId] > 1) != 0)) {
for (var_s1 = 0; var_s1 < D_80155C70[i].numInstruments; var_s1++) { for (instId = 0; instId < gSoundFontList[fondId].numInstruments; instId++) {
temp_v0_2 = func_80011D4C(i, var_s1); instrument = Audio_GetInstrument(fondId, instId);
if (temp_v0_2 != NULL) { if (instrument != NULL) {
if (temp_v0_2->normalRangeLo != 0) { if (instrument->normalRangeLo != 0) {
func_8000E1C4(entry, temp_v0_2->lowPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->lowPitchTunedSample.sample);
} }
if (temp_v0_2->normalRangeHi != 0x7F) { if (instrument->normalRangeHi != 0x7F) {
func_8000E1C4(entry, temp_v0_2->highPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->highPitchTunedSample.sample);
} }
func_8000E1C4(entry, temp_v0_2->normalPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->normalPitchTunedSample.sample);
} }
} }
for (var_s2 = 0; var_s2 < D_80155C70[i].numDrums; var_s2++) { for (drumId = 0; drumId < gSoundFontList[fondId].numDrums; drumId++) {
temp_v0_3 = func_80011DFC(i, var_s2); drum = Audio_GetDrum(fondId, drumId);
if (temp_v0_3 != NULL) { if (drum != NULL) {
func_8000E1C4(entry, temp_v0_3->tunedSample.sample); AudioHeap_UnapplySampleCache(entry, drum->tunedSample.sample);
} }
} }
} }
@ -885,68 +885,68 @@ void func_8000DFFC(SampleCacheEntry* entry) {
} }
} }
void func_8000E1C4(SampleCacheEntry* entry, Sample* sample) { void AudioHeap_UnapplySampleCache(SampleCacheEntry* entry, Sample* sample) {
if ((sample != NULL) && (sample->sampleAddr == entry->allocatedAddr)) { if ((sample != NULL) && (sample->sampleAddr == entry->allocatedAddr)) {
sample->sampleAddr = entry->sampleAddr; sample->sampleAddr = entry->sampleAddr;
sample->medium = entry->origMedium; sample->medium = entry->origMedium;
} }
} }
SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(u32 arg0) { SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(u32 size) {
AudioSampleCache* cache = &D_8014C940; AudioSampleCache* cache = &gPersistentSampleCache;
SampleCacheEntry* temp_v0; SampleCacheEntry* entry;
u8* temp_v0_2; u8* ramAddr;
temp_v0_2 = AudioHeap_Alloc(&cache->pool, arg0); ramAddr = AudioHeap_Alloc(&cache->pool, size);
if (temp_v0_2 == NULL) { if (ramAddr == NULL) {
return NULL; return NULL;
} }
temp_v0 = &cache->entries[cache->numEntries]; entry = &cache->entries[cache->numEntries];
temp_v0->inUse = 1; entry->inUse = 1;
temp_v0->allocatedAddr = temp_v0_2; entry->allocatedAddr = ramAddr;
temp_v0->size = arg0; entry->size = size;
cache->numEntries++; cache->numEntries++;
return temp_v0; return entry;
} }
void func_8000E290(void) { void AudioHeap_DiscardSampleCaches(void) {
s32 fontId;
s32 i; s32 i;
s32 j; s32 numFonts;
s32 sp40; s32 pad;
s32 temp_a0; s32 sampleBankId2;
s32 temp_v1; s32 sampleBankId1;
u32 temp_a1; s32 instId;
s32 var_s1; s32 drumId;
s32 var_s2; Drum* drum;
Drum* temp_v0_3; Instrument* instrument;
Instrument* temp_v0_2;
SampleCacheEntry* entry; SampleCacheEntry* entry;
sp40 = D_80155C60->numEntries; numFonts = gSoundFontTable->numEntries;
for (i = 0; i < sp40; i++) { for (fontId = 0; fontId < numFonts; fontId++) {
temp_v1 = D_80155C70[i].sampleBankId1; sampleBankId1 = gSoundFontList[fontId].sampleBankId1;
temp_a0 = D_80155C70[i].sampleBankId2; sampleBankId2 = gSoundFontList[fontId].sampleBankId2;
if (((temp_v1 != 0xFFU) && (entry->sampleBankId == temp_v1)) || if (((sampleBankId1 != 0xFFU) && (entry->sampleBankId == sampleBankId1)) ||
((temp_a0 != 0xFF) && (entry->sampleBankId == temp_a0)) || (entry->sampleBankId == 0)) { ((sampleBankId2 != 0xFF) && (entry->sampleBankId == sampleBankId2)) || (entry->sampleBankId == 0)) {
if ((AudioHeap_SearchCaches(1, 3, i) != NULL) && ((D_8014D3E8[i] > 1) != 0)) { if ((AudioHeap_SearchCaches(1, 3, fontId) != NULL) && ((gFontLoadStatus[fontId] > 1) != 0)) {
for (j = 0; j < D_8014C940.numEntries; j++) { for (i = 0; i < gPersistentSampleCache.numEntries; i++) {
entry = &D_8014C940.entries[j]; entry = &gPersistentSampleCache.entries[i];
for (var_s1 = 0; var_s1 < D_80155C70[i].numInstruments; var_s1++) { for (instId = 0; instId < gSoundFontList[fontId].numInstruments; instId++) {
temp_v0_2 = func_80011D4C(i, var_s1); instrument = Audio_GetInstrument(fontId, instId);
if (temp_v0_2 != NULL) { if (instrument != NULL) {
if (temp_v0_2->normalRangeLo != 0) { if (instrument->normalRangeLo != 0) {
func_8000E1C4(entry, temp_v0_2->lowPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->lowPitchTunedSample.sample);
} }
if (temp_v0_2->normalRangeHi != 0x7F) { if (instrument->normalRangeHi != 0x7F) {
func_8000E1C4(entry, temp_v0_2->highPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->highPitchTunedSample.sample);
} }
func_8000E1C4(entry, temp_v0_2->normalPitchTunedSample.sample); AudioHeap_UnapplySampleCache(entry, instrument->normalPitchTunedSample.sample);
} }
} }
for (var_s2 = 0; var_s2 < D_80155C70[i].numDrums; var_s2++) { for (drumId = 0; drumId < gSoundFontList[fontId].numDrums; drumId++) {
temp_v0_3 = func_80011DFC(i, var_s2); drum = Audio_GetDrum(fontId, drumId);
if (temp_v0_3 != NULL) { if (drum != NULL) {
func_8000E1C4(entry, temp_v0_3->tunedSample.sample); AudioHeap_UnapplySampleCache(entry, drum->tunedSample.sample);
} }
} }
} }

1425
src/main/audio_load.c
View file

File diff suppressed because it is too large Load diff

4
src/main/audio_playback.c
View file

@ -7,9 +7,9 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011D10.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011D10.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011D4C.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/Audio_GetInstrument.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011DFC.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/Audio_GetDrum.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011EB8.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_playback/func_80011EB8.s")

12
src/main/audio_thread.c
View file

@ -10,12 +10,12 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E778.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E778.s")
void func_8001E7C8(void) { void func_8001E7C8(void) {
D_800C7C50 = 0; gThreadCmdWritePos = 0;
D_800C7C54 = 0; gThreadCmdReadPos = 0;
osCreateMesgQueue(D_800C7C58, D_80156600, 1); osCreateMesgQueue(gAudioTaskStartQueue, D_80156600, 1);
osCreateMesgQueue(D_800C7C5C, D_80156608, 4); osCreateMesgQueue(gThreadCmdProcQueue, D_80156608, 4);
osCreateMesgQueue(D_800C7C60, D_80156618, 1); osCreateMesgQueue(gAudioUnkQueue, D_80156618, 1);
osCreateMesgQueue(D_800C7C64, D_8015661C, 1); osCreateMesgQueue(gAudioResetQueue, D_8015661C, 1);
} }
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E850.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E850.s")

122
src/main/audiotables.c Normal file
View file

@ -0,0 +1,122 @@
#include "sys.h"
#include "sf64audio_provisional.h"
typedef struct {
/* 0x00 */ s16 numEntries;
/* 0x02 */ s16 unkMediumParam;
/* 0x04 */ u32 romAddr;
/* 0x08 */ char pad[0x8];
} AudioTableBase;
AudioTableBase gSampleBankTableInit = { 4, 0, 0 };
AudioTableEntry gSampleBankTableInitEntries[4] = {
{ 0, 0xE1E30, 2, 4, 0, 0, 0 },
{ 0xE1E30, 0xFF9D0, 2, 4, 0, 0, 0 },
{ 0x1E1800, 0x497480, 2, 4, 0, 0, 0 },
{ 0x678C80, 0xC3900, 2, 4, 0, 0, 0 },
};
AudioTableBase gSeqTableInit = { 0x42, 0, 0 };
AudioTableEntry gSeqTableInitEntries[66] = {
/* 00 */ { 0, 0x3AF0, 2, 0, 0, 0, 0 },
/* 01 */ { 0x3AF0, 0x56B0, 2, 0, 0, 0, 0 },
/* 02 */ { 0x91A0, 0x2D80, 2, 3, 0, 0, 0 },
/* 03 */ { 0xBF20, 0x1410, 2, 3, 0, 0, 0 },
/* 04 */ { 0xD330, 0x1600, 2, 3, 0, 0, 0 },
/* 05 */ { 0xE930, 0xF20, 2, 3, 0, 0, 0 },
/* 06 */ { 0xF850, 0x13A0, 2, 3, 0, 0, 0 },
/* 07 */ { 0x10BF0, 0x1100, 2, 3, 0, 0, 0 },
/* 08 */ { 0x11CF0, 0x19E0, 2, 3, 0, 0, 0 },
/* 09 */ { 0x136D0, 0x13E0, 2, 3, 0, 0, 0 },
/* 10 */ { 0x14AB0, 0x12F0, 2, 3, 0, 0, 0 },
/* 11 */ { 9, 0, 2, 3, 0, 0, 0 },
/* 12 */ { 0x15DA0, 0xB70, 2, 3, 0, 0, 0 },
/* 13 */ { 0x16910, 0x2460, 2, 3, 0, 0, 0 },
/* 14 */ { 0x18D70, 0xD40, 2, 3, 0, 0, 0 },
/* 15 */ { 10, 0, 2, 3, 0, 0, 0 },
/* 16 */ { 4, 0, 2, 3, 0, 0, 0 },
/* 17 */ { 0x19AB0, 0x7F0, 2, 3, 0, 0, 0 },
/* 18 */ { 0x1A2A0, 0x1440, 2, 3, 0, 0, 0 },
/* 19 */ { 0x1B6E0, 0x1B20, 2, 3, 0, 0, 0 },
/* 20 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 21 */ { 18, 0, 2, 3, 0, 0, 0 },
/* 22 */ { 18, 0, 2, 3, 0, 0, 0 },
/* 23 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 24 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 25 */ { 0x1D200, 0x1B30, 2, 3, 0, 0, 0 },
/* 26 */ { 18, 0, 2, 3, 0, 0, 0 },
/* 27 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 28 */ { 0x1ED30, 0x10B0, 2, 3, 0, 0, 0 },
/* 29 */ { 28, 0, 2, 3, 0, 0, 0 },
/* 30 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 31 */ { 28, 0, 2, 3, 0, 0, 0 },
/* 32 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 33 */ { 0x1FDE0, 0x1410, 2, 3, 0, 0, 0 },
/* 34 */ { 0x211F0, 0xF30, 2, 3, 0, 0, 0 },
/* 35 */ { 0x22120, 0x2B30, 2, 3, 0, 0, 0 },
/* 36 */ { 0x24C50, 0x7F0, 2, 3, 0, 0, 0 },
/* 37 */ { 0x25440, 0x13B0, 2, 3, 0, 0, 0 },
/* 38 */ { 0x267F0, 0xC70, 2, 3, 0, 0, 0 },
/* 39 */ { 0x27460, 0x180, 2, 3, 0, 0, 0 },
/* 40 */ { 0x275E0, 0x5C0, 2, 3, 0, 0, 0 },
/* 41 */ { 34, 0, 2, 3, 0, 0, 0 },
/* 42 */ { 0x27BA0, 0x4E40, 2, 3, 0, 0, 0 },
/* 43 */ { 0x2C9E0, 0x14E0, 2, 3, 0, 0, 0 },
/* 44 */ { 0x2DEC0, 0x400, 2, 3, 0, 0, 0 },
/* 45 */ { 0x2E2C0, 0x800, 2, 3, 0, 0, 0 },
/* 46 */ { 0x2EAC0, 0x1AB0, 2, 3, 0, 0, 0 },
/* 47 */ { 0x30570, 0x1AA0, 2, 3, 0, 0, 0 },
/* 48 */ { 19, 0, 2, 3, 0, 0, 0 },
/* 49 */ { 0x32010, 0x1370, 2, 3, 0, 0, 0 },
/* 50 */ { 0x33380, 0xB80, 2, 3, 0, 0, 0 },
/* 51 */ { 0x33F00, 0x5C0, 2, 3, 0, 0, 0 },
/* 52 */ { 37, 0, 2, 3, 0, 0, 0 },
/* 53 */ { 37, 0, 2, 3, 0, 0, 0 },
/* 54 */ { 0x344C0, 0x550, 2, 3, 0, 0, 0 },
/* 55 */ { 0x34A10, 0x360, 2, 3, 0, 0, 0 },
/* 56 */ { 0x34D70, 0x620, 2, 3, 0, 0, 0 },
/* 57 */ { 56, 0, 2, 3, 0, 0, 0 },
/* 58 */ { 0x35390, 0xA70, 2, 3, 0, 0, 0 },
/* 59 */ { 43, 0, 2, 3, 0, 0, 0 },
/* 60 */ { 0x35E00, 0xAB0, 2, 3, 0, 0, 0 },
/* 61 */ { 0x368B0, 0x13D0, 2, 3, 0, 0, 0 },
/* 62 */ { 0x37C80, 0x250, 2, 3, 0, 0, 0 },
/* 63 */ { 0x37ED0, 0x6F0, 2, 3, 0, 0, 0 },
/* 64 */ { 0x385C0, 0xFB0, 2, 3, 0, 0, 0 },
/* 65 */ { 0x39570, 0x1780, 2, 3, 0, 0, 0 },
};
AudioTableBase gSoundFontTableInit = { 0x21, 0, 0 };
AudioTableEntry gSoundFontTableInitEntries[0x21] = {
{ 0, 0x2F00, 2, 0, 0xFF, 0x7F00, 0 }, { 0x2F00, 0xFE0, 2, 0, 0x1FF, 0x7F00, 0 },
{ 0x3EE0, 0x640, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x4520, 0x1560, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x5A80, 0xC00, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x6680, 0xDE0, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x7460, 0x1200, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x8660, 0x1040, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x96A0, 0xE40, 2, 0, 0x2FF, 0x7F00, 0 }, { 0xA4E0, 0xC20, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0xB100, 0x1920, 2, 0, 0x2FF, 0x7F00, 0 }, { 0xCA20, 0xA20, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0xD440, 0xA00, 2, 0, 0x2FF, 0x7F00, 0 }, { 0xDE40, 0xD60, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0xEBA0, 0xC20, 2, 0, 0x2FF, 0x7F00, 0 }, { 0xF7C0, 0xF00, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x106C0, 0xF20, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x115E0, 0xE20, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x12400, 0x10A0, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x134A0, 0x2580, 2, 0, 0x2FF, 0x7F00, 0 },
{ 0x15A20, 0x9E0, 2, 0, 0x2FF, 0x7F00, 0 }, { 0x16400, 0x1220, 2, 3, 0x3FF, 0x1040, 0 },
{ 0x17620, 0x180, 2, 3, 0x3FF, 0x300, 0 }, { 0x177A0, 0x11C0, 2, 3, 0x3FF, 0x1040, 0 },
{ 0x18960, 0x940, 2, 3, 0x3FF, 0xA40, 0 }, { 0x192A0, 0x9E0, 2, 3, 0x3FF, 0xA40, 0 },
{ 0x19C80, 0x920, 2, 3, 0x3FF, 0xA40, 0 }, { 0x1A5A0, 0x9E0, 2, 3, 0x3FF, 0xA40, 0 },
{ 0x1AF80, 0x9E0, 2, 3, 0x3FF, 0xA40, 0 }, { 0x1B960, 0xA10, 2, 3, 0x3FF, 0xA40, 0 },
{ 0x1C370, 0x9E0, 2, 3, 0x3FF, 0xA40, 0 }, { 0x1CD50, 0xA00, 2, 3, 0x3FF, 0xA40, 0 },
{ 0x1D750, 0x8D0, 2, 3, 0x3FF, 0xA40, 0 },
};
u8 gSeqFontTableInit[288] = {
0, 132, 0, 134, 0, 155, 0, 157, 0, 159, 0, 161, 0, 163, 0, 165, 0, 167, 0, 169, 0, 171, 0, 173,
0, 175, 0, 177, 0, 179, 0, 181, 0, 183, 0, 185, 0, 187, 0, 189, 0, 191, 0, 193, 0, 195, 0, 197,
0, 199, 0, 201, 0, 203, 0, 205, 0, 207, 0, 209, 0, 211, 0, 213, 0, 215, 0, 217, 0, 219, 0, 221,
0, 223, 0, 225, 0, 227, 0, 229, 0, 231, 0, 233, 0, 235, 0, 237, 0, 239, 0, 241, 0, 243, 0, 245,
0, 247, 0, 249, 0, 251, 0, 253, 0, 255, 1, 1, 1, 3, 1, 5, 1, 7, 1, 9, 1, 11, 1, 13,
1, 15, 1, 17, 1, 19, 1, 21, 1, 23, 1, 25, 1, 0, 20, 20, 19, 18, 17, 16, 15, 14, 13, 12,
11, 10, 9, 8, 7, 6, 5, 4, 3, 1, 2, 1, 24, 1, 29, 1, 25, 1, 26, 1, 28, 1, 25, 1,
25, 1, 29, 1, 24, 1, 29, 1, 28, 1, 25, 1, 30, 1, 24, 1, 25, 1, 28, 1, 28, 1, 31, 1,
31, 1, 28, 1, 28, 1, 31, 1, 31, 1, 31, 1, 28, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1,
31, 1, 32, 1, 21, 1, 21, 1, 22, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 23, 1, 25, 1,
21, 1, 21, 1, 29, 1, 25, 1, 31, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1,
21, 1, 21, 1, 27, 1, 25, 1, 21, 1, 25, 1, 25, 1, 25, 1, 21, 1, 31, 0, 0, 0, 0, 0,
};

37
src/main/fox_360.c
View file

@ -1,13 +1,6 @@
#include "prevent_bss_reordering.h" #include "prevent_bss_reordering.h"
#include "global.h" #include "global.h"
typedef struct {
s32 unk_00;
char unk_04[0x2F0];
} UnkStruct_1515F0; // size = 0x2F4
// placeholder for audio struct. struct size being equal to Actor probably coincidental
extern UnkStruct_1515F0 D_801515F0[];
/* static */ Vec3f D_800C9A90 = { 0.0f, -10.0f, 0.0f }; /* static */ Vec3f D_800C9A90 = { 0.0f, -10.0f, 0.0f };
/* static */ Vec3f D_800C9A9C[4] = { /* static */ Vec3f D_800C9A9C[4] = {
{ 0.0f, 20000.0f, 0.0f }, { 0.0f, 20000.0f, 0.0f },
@ -103,7 +96,7 @@ void func_8002E548(void) {
func_8008E51C(D_8015F930, D_8015F944); func_8008E51C(D_8015F930, D_8015F944);
if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) { if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
Audio_PlaySfx(0x4900C02A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900C02A, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -201,7 +194,7 @@ void func_8002E700(Player* player) {
} else { } else {
gRightWingHealth[0] = gLeftWingHealth[0] = 60; gRightWingHealth[0] = gLeftWingHealth[0] = 60;
} }
Audio_PlaySfx(0x4900200E, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900200E, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_1D0++; player->unk_1D0++;
} }
break; break;
@ -214,7 +207,7 @@ void func_8002E700(Player* player) {
player->unk_0D0 = D_80161A54; player->unk_0D0 = D_80161A54;
player->unk_1D0++; player->unk_1D0++;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 4: case 4:
@ -389,12 +382,12 @@ void func_8002F180(void) {
} }
actor->iwork[11] = 1; actor->iwork[11] = 1;
if (actor->unk_0E4 < 4) { if (actor->unk_0E4 < 4) {
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C);
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
actor->info.bonus = 0; actor->info.bonus = 0;
} else { } else {
Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -428,9 +421,9 @@ void func_8002F3E0(void) {
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (gCurrentLevel == LEVEL_VENOM_2) { if (gCurrentLevel == LEVEL_VENOM_2) {
Audio_PlaySfx(0x31004006, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31004006, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x31004005, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31004005, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -641,7 +634,7 @@ void func_8002FEF0(Actor* actor) {
newActor->obj.pos.x = 200.0f; newActor->obj.pos.x = 200.0f;
newActor->obj.pos.y = -500.0f; newActor->obj.pos.y = -500.0f;
newActor->obj.pos.z = 0.0f; newActor->obj.pos.z = 0.0f;
Audio_PlaySfx(0x09000002, newActor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, newActor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
newActor->timer_0C2 = 50; newActor->timer_0C2 = 50;
} else { } else {
newActor->obj.pos.x = 0.0f; newActor->obj.pos.x = 0.0f;
@ -868,7 +861,7 @@ void func_8003088C(Actor* actor) {
actor->obj.status = OBJ_DYING; actor->obj.status = OBJ_DYING;
actor->fwork[23] = 0.0f; actor->fwork[23] = 0.0f;
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f);
Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0C2 = 10; actor->timer_0C2 = 10;
actor->timer_0BE = 0; actor->timer_0BE = 0;
actor->timer_04C = RAND_INT(2.9f); actor->timer_04C = RAND_INT(2.9f);
@ -978,16 +971,16 @@ void func_8003088C(Actor* actor) {
break; break;
} }
} else { } else {
D_801515F0[actor->unk_0D4].unk_00 = 80; gActors[actor->unk_0D4 - 101].iwork[1] = 80;
} }
} else { } else {
D_801515F0[actor->unk_0D4].unk_00 = 80; gActors[actor->unk_0D4 - 101].iwork[1] = 80;
} }
break; break;
} }
} else { } else {
if (var_a1) { if (var_a1) {
Audio_PlaySfx(0x29001062, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29001062, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[7] = 3; actor->iwork[7] = 3;
actor->iwork[18] = 5; actor->iwork[18] = 5;
actor->iwork[8] = 15; actor->iwork[8] = 15;
@ -1003,9 +996,9 @@ void func_8003088C(Actor* actor) {
actor->iwork[8] = 20; actor->iwork[8] = 20;
} }
if (actor->unk_0E4 == 200) { if (actor->unk_0E4 == 200) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (actor->iwork[7] == 0) { } else if (actor->iwork[7] == 0) {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f);
if (actor->unk_0E4 < 100) { if (actor->unk_0E4 < 100) {
@ -1337,7 +1330,7 @@ void func_800319AC(Actor* this) {
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
this->fwork[7] = 360.0f; this->fwork[7] = 360.0f;
this->fwork[8] = 0.0f; this->fwork[8] = 0.0f;
Audio_PlaySfx(0x09000002, this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, this->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
this->unk_046 = 0; this->unk_046 = 0;
} }
gTeamShields[this->unk_0E4] = -1; gTeamShields[this->unk_0E4] = -1;

8
src/main/fox_beam.c
View file

@ -705,7 +705,7 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) {
shot->obj.pos.z += shot->vel.z * 5.0f; shot->obj.pos.z += shot->vel.z * 5.0f;
actor->timer_0C2 = 3; actor->timer_0C2 = 3;
func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800A668C(D_8017849C, D_801784A0, D_80178498); func_800A668C(D_8017849C, D_801784A0, D_80178498);
} }
} else { } else {
@ -852,7 +852,7 @@ void func_80038140(PlayerShot* shot) {
shot->obj.pos.y += 2.0f * shot->vel.y; shot->obj.pos.y += 2.0f * shot->vel.y;
shot->obj.pos.z += 2.0f * shot->vel.z; shot->obj.pos.z += 2.0f * shot->vel.z;
shot->unk_64 = 5; shot->unk_64 = 5;
Audio_PlaySfx(0x09007011, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09007011, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_80078E50(player->pos.x, player->pos.y, player->unk_138, 8.0f); func_80078E50(player->pos.x, player->pos.y, player->unk_138, 8.0f);
} else { } else {
func_80036318(shot); func_80036318(shot);
@ -953,7 +953,7 @@ void func_80038140(PlayerShot* shot) {
} else { } else {
boss->dmgType = DMG_BEAM; boss->dmgType = DMG_BEAM;
func_80036318(shot); func_80036318(shot);
Audio_PlaySfx(0x29001062, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29001062, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} else { } else {
@ -967,7 +967,7 @@ void func_80038140(PlayerShot* shot) {
} else { } else {
boss->dmgType = DMG_BEAM; boss->dmgType = DMG_BEAM;
boss->dmgPart = 100; boss->dmgPart = 100;
Audio_PlaySfx(0x29121007, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_80036318(shot); func_80036318(shot);
} }
} }

2
src/main/fox_buffers.c
View file

@ -4,7 +4,7 @@ u64 gDramStack[SP_DRAM_STACK_SIZE64];
u8 gOSYieldData[OS_YIELD_DATA_SIZE]; u8 gOSYieldData[OS_YIELD_DATA_SIZE];
FrameBuffer gZBuffer; // z buffer FrameBuffer gZBuffer; // z buffer
u8 gTaskOutputBuffer[0x30000]; u8 gTaskOutputBuffer[0x30000];
u8 gAudioDataBuffer[0xB0000]; u8 gAudioHeap[0xB0000];
u16 gTextureRenderBuffer[0x3C40]; u16 gTextureRenderBuffer[0x3C40];
u16 gFillBuffer[3 * SCREEN_WIDTH]; u16 gFillBuffer[3 * SCREEN_WIDTH];
FrameBuffer gFrameBuffers[3]; FrameBuffer gFrameBuffers[3];

42
src/main/fox_demo.c
View file

@ -194,12 +194,12 @@ void func_80048CC4(Actor* actor, s32 arg1) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (arg1 == 3) { if (arg1 == 3) {
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} else { } else {
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -286,7 +286,7 @@ void func_80048E40(Player* player) {
break; break;
case 450: case 450:
Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
@ -377,7 +377,7 @@ void func_80049630(Actor* actor) {
case 1: case 1:
actor->state = 2; actor->state = 2;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0BC = 0x96; actor->timer_0BC = 0x96;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
@ -431,7 +431,7 @@ void func_80049968(Actor* actor, s32 arg1) {
actor->vel.z = gPlayer[0].vel.z; actor->vel.z = gPlayer[0].vel.z;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_80049A9C(Effect* effect, f32 x, f32 y, f32 z) { void func_80049A9C(Effect* effect, f32 x, f32 y, f32 z) {
@ -560,22 +560,22 @@ void func_80049C0C(Player* player) {
if ((player->timer_1F8 == 0x5F) && (gTeamShields[1] > 0)) { if ((player->timer_1F8 == 0x5F) && (gTeamShields[1] > 0)) {
gActors[0].state = var_v0; gActors[0].state = var_v0;
Audio_PlaySfx(0x0940802AU, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940802AU, gActors[0].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((player->timer_1F8 == 0x5A) && (gTeamShields[3] > 0)) { if ((player->timer_1F8 == 0x5A) && (gTeamShields[3] > 0)) {
gActors[2].state = var_v0; gActors[2].state = var_v0;
Audio_PlaySfx(0x0940802AU, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940802AU, gActors[2].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((player->timer_1F8 == 85) && (gTeamShields[2] > 0)) { if ((player->timer_1F8 == 85) && (gTeamShields[2] > 0)) {
gActors[1].state = var_v0; gActors[1].state = var_v0;
Audio_PlaySfx(0x0940802AU, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940802AU, gActors[1].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (player->timer_1F8 == 60) { if (player->timer_1F8 == 60) {
gActors[3].state = var_v0; gActors[3].state = var_v0;
Audio_PlaySfx(0x0940802AU, gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940802AU, gActors[3].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
} }
@ -608,7 +608,7 @@ void func_80049C0C(Player* player) {
player->unk_234 = 1; player->unk_234 = 1;
D_8017827C = 1; D_8017827C = 1;
D_800CA230 = 0.15f; D_800CA230 = 0.15f;
Audio_PlaySfx(0x11407079U, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11407079U, gDefaultSfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800AB334(); func_800AB334();
} }
} }
@ -757,7 +757,7 @@ void func_8004A700(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_800CA074[arg1]; actor->obj.rot.z = D_800CA074[arg1];
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8004A840(s32 actor) { void func_8004A840(s32 actor) {
@ -885,11 +885,11 @@ void func_8004AAF4(Player* player) {
} }
if (gCsFrameCount == 0x8A) { if (gCsFrameCount == 0x8A) {
Audio_PlaySfx(0x09000007U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000007U, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (gCsFrameCount == 0xBE) { if (gCsFrameCount == 0xBE) {
Audio_PlaySfx(0x09000013U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000013U, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (D_80177A48[1] > 350.0f) { if (D_80177A48[1] > 350.0f) {
@ -899,7 +899,7 @@ void func_8004AAF4(Player* player) {
player->unk_194 = 10.0f; player->unk_194 = 10.0f;
player->unk_190 = 10.0f; player->unk_190 = 10.0f;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801779A8[player->num] = 70.0f; D_801779A8[player->num] = 70.0f;
@ -1964,7 +1964,7 @@ void func_8004E4D4(Actor* actor) {
actor->state = 2; actor->state = 2;
actor->timer_0BC = 0x32; actor->timer_0BC = 0x32;
actor->fwork[9] = 2.0f; actor->fwork[9] = 2.0f;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
@ -1986,7 +1986,7 @@ void func_8004E4D4(Actor* actor) {
actor->state = 0xB; actor->state = 0xB;
actor->timer_0BC = 0x96; actor->timer_0BC = 0x96;
actor->timer_0BE = 0x28; actor->timer_0BE = 0x28;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 11: case 11:
@ -2041,7 +2041,7 @@ void func_8004E4D4(Actor* actor) {
break; break;
case 31: case 31:
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state += 1; actor->state += 1;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
@ -2198,7 +2198,8 @@ void func_8004F05C(Actor* actor) {
case 1: case 1:
actor->state = 2; actor->state = 2;
actor->timer_0BC = 0x64; actor->timer_0BC = 0x64;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
case 2: case 2:
@ -2417,7 +2418,8 @@ void func_8004F8AC(Actor* actor) {
actor->state = 1; actor->state = 1;
actor->timer_0BC = 0x32; actor->timer_0BC = 0x32;
actor->iwork[0] = 255; actor->iwork[0] = 255;
Audio_PlaySfx(0x2902F026U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902F026U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
break; break;

38
src/main/fox_effect.c
View file

@ -951,7 +951,7 @@ void func_8007A4B8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
effect->obj.pos.y = yPos; effect->obj.pos.y = yPos;
effect->obj.pos.z = zPos; effect->obj.pos.z = zPos;
Audio_PlaySfx(0x2940F026, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -979,12 +979,12 @@ void func_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) {
effect->timer_50 = 50; effect->timer_50 = 50;
if ((sfxId == 0x1903400F) || (sfxId == 0x11000055)) { if ((sfxId == 0x1903400F) || (sfxId == 0x11000055)) {
Audio_PlaySfx(sfxId, effect->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, effect->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (sfxId == 0x11000055) { if (sfxId == 0x11000055) {
effect->timer_50 = 300; effect->timer_50 = 300;
} }
} else { } else {
Audio_PlaySfx(sfxId, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -1224,7 +1224,7 @@ void func_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
effect->unk_44 = 0xFF; effect->unk_44 = 0xFF;
effect->scale1 = scale1; effect->scale1 = scale1;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
Audio_PlaySfx(0x1100000C, effect->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1100000C, effect->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { void func_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
@ -2208,7 +2208,7 @@ void func_8007DB70(Effect* effect) {
effect->unk_44 = 192; effect->unk_44 = 192;
effect->scale2 = 2.5f; effect->scale2 = 2.5f;
effect->scale1 = 2.5f; effect->scale1 = 2.5f;
Audio_PlaySfx(0x2903B009, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f); func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f);
func_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, func_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f,
5); 5);
@ -2422,7 +2422,7 @@ void func_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32
} }
if (objId == OBJ_EFFECT_356) { if (objId == OBJ_EFFECT_356) {
Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (objId == OBJ_EFFECT_376) { if (objId == OBJ_EFFECT_376) {
@ -2433,10 +2433,10 @@ void func_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32
} }
if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) { if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) {
Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) { void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) {
@ -2479,7 +2479,7 @@ void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32
} }
if (objId == OBJ_EFFECT_356) { if (objId == OBJ_EFFECT_356) {
Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (objId == OBJ_EFFECT_376) { if (objId == OBJ_EFFECT_376) {
@ -2490,10 +2490,10 @@ void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32
} }
if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) { if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) {
Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, void func_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel,
@ -2514,9 +2514,9 @@ void func_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos,
effect->scale2 = scale2; effect->scale2 = scale2;
if (objId == OBJ_EFFECT_355) { if (objId == OBJ_EFFECT_355) {
Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000025, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -2561,7 +2561,7 @@ void func_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos,
effect->scale2 = scale2; effect->scale2 = scale2;
if (effect->obj.id != OBJ_EFFECT_380) { if (effect->obj.id != OBJ_EFFECT_380) {
Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -2897,7 +2897,7 @@ void func_8007FE88(Effect* effect) {
effect->vel.y = destVelocity.y; effect->vel.y = destVelocity.y;
effect->vel.z = destVelocity.z; effect->vel.z = destVelocity.z;
gPlayer[0].unk_2C4 += 1; gPlayer[0].unk_2C4 += 1;
Audio_PlaySfx(0x09007011, effect->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09007011, effect->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) {
@ -3030,7 +3030,7 @@ void func_8008040C(Effect* effect) {
effect->vel.y = destVelocity.y; effect->vel.y = destVelocity.y;
effect->vel.z = destVelocity.z; effect->vel.z = destVelocity.z;
gPlayer[0].unk_2C4++; gPlayer[0].unk_2C4++;
Audio_PlaySfx(0x09007011, effect->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09007011, effect->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) {
@ -3394,7 +3394,7 @@ void func_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32
case 10: case 10:
effect->timer_50 = 10; effect->timer_50 = 10;
Audio_PlaySfx(0x31405094, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31405094, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 11: case 11:
@ -3415,7 +3415,7 @@ void func_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32
effect->obj.pos.y = yPos; effect->obj.pos.y = yPos;
effect->obj.pos.z = zPos; effect->obj.pos.z = zPos;
Audio_PlaySfx(0x2940F026, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80177BD0[0] = 60; D_Timer_80177BD0[0] = 60;
break; break;
} }
@ -4154,7 +4154,7 @@ void func_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) {
if (gEffects[j].obj.status == OBJ_FREE) { if (gEffects[j].obj.status == OBJ_FREE) {
func_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i); func_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i);
if (i == 0) { if (i == 0) {
Audio_PlaySfx(0x3103109B, gEffects[j].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3103109B, gEffects[j].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }

37
src/main/fox_enmy.c
View file

@ -63,9 +63,9 @@ void func_80060F30(f32* pos, u32 sfxId, s32 arg2) {
(void) "center_X %f\n"; (void) "center_X %f\n";
(void) "Enm->obj.pos.x %f\n"; (void) "Enm->obj.pos.x %f\n";
if (!gVersusMode) { if (!gVersusMode) {
Audio_PlaySfx(sfxId, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(sfxId, pos, arg2, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, pos, arg2, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -996,10 +996,10 @@ void Object_Init(s32 index, ObjectId objId) {
func_8007A6F0(&gObjects4C[index].obj.pos, 0x11000055); func_8007A6F0(&gObjects4C[index].obj.pos, 0x11000055);
break; break;
case OBJ_ACTOR_234: case OBJ_ACTOR_234:
Audio_PlaySfx(0x11030010, gActors[index].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, gActors[index].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case OBJ_80_54: case OBJ_80_54:
Audio_PlaySfx(0x11000000, gObjects80[index].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000000, gObjects80[index].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case OBJ_ACTOR_198: case OBJ_ACTOR_198:
func_80092D48(&gActors[index]); func_80092D48(&gActors[index]);
@ -1154,7 +1154,7 @@ void Object_Init(s32 index, ObjectId objId) {
break; break;
case OBJ_ACTOR_190: case OBJ_ACTOR_190:
case OBJ_ACTOR_191: case OBJ_ACTOR_191:
Audio_PlaySfx(0x31000012, gActors[index].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000012, gActors[index].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case OBJ_ACTOR_192: case OBJ_ACTOR_192:
gActors[index].unk_0C9 = 1; gActors[index].unk_0C9 = 1;
@ -1206,7 +1206,7 @@ void Object_Init(s32 index, ObjectId objId) {
/* fallthrough */ /* fallthrough */
case OBJ_ACTOR_176: case OBJ_ACTOR_176:
gActors[index].health = 24; gActors[index].health = 24;
Audio_PlaySfx(0x31000016, gActors[index].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000016, gActors[index].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case OBJ_BOSS_297: case OBJ_BOSS_297:
func_i2_80188A40(&gBosses[index]); func_i2_80188A40(&gBosses[index]);
@ -1608,10 +1608,10 @@ void func_800660F0(Actor* actor) {
} }
if ((item->obj.id >= OBJ_ITEM_GOLD_RING) || (item->obj.id == OBJ_ITEM_1UP)) { if ((item->obj.id >= OBJ_ITEM_GOLD_RING) || (item->obj.id == OBJ_ITEM_1UP)) {
item->unk_50 = 90.0f; item->unk_50 = 90.0f;
Audio_PlaySfx(0x4900000C, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900000C, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
item->timer_48 = 1000; item->timer_48 = 1000;
if (item->obj.id == OBJ_ITEM_WING_REPAIR) { if (item->obj.id == OBJ_ITEM_WING_REPAIR) {
Audio_PlaySfx(0x1900302B, item->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900302B, item->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1666,7 +1666,7 @@ void func_80066254(Actor* actor) {
} }
} }
func_800660F0(actor); func_800660F0(actor);
Audio_PlaySfx(0x4900000C, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900000C, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (actor->unk_044 == 24) { } else if (actor->unk_044 == 24) {
if (gTeamShields[3] > 0) { if (gTeamShields[3] > 0) {
Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY);
@ -1735,7 +1735,7 @@ void func_8006654C(Actor* actor) {
actor->vel.z = -15.0f; actor->vel.z = -15.0f;
actor->gravity = 0.5f; actor->gravity = 0.5f;
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f);
Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1750,7 +1750,7 @@ void func_8006684C(Actor* actor) {
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
actor->unk_044 = 1; actor->unk_044 = 1;
func_80066254(actor); func_80066254(actor);
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 3);
gHitCount += 3; gHitCount += 3;
D_80177850 = 15; D_80177850 = 15;
@ -1828,7 +1828,7 @@ void func_80066D5C(Object_80* obj80) {
case 1: case 1:
func_80066C00(obj80); func_80066C00(obj80);
obj80->state++; obj80->state++;
Audio_PlaySfx(0x2900300F, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900300F, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2: case 2:
obj80->vel.x += 0.05f; obj80->vel.x += 0.05f;
@ -1839,7 +1839,7 @@ void func_80066D5C(Object_80* obj80) {
func_80066A8C(obj80); func_80066A8C(obj80);
obj80->state = 0; obj80->state = 0;
D_80178480 = 25; D_80178480 = 25;
Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 0: case 0:
@ -2028,7 +2028,7 @@ void func_80067874(Actor* actor) {
} }
void func_80067A40(void) { void func_80067A40(void) {
Audio_PlaySfx(0x09008023, gPlayer[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09008023, gPlayer[0].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) { if (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) {
D_80177D40[0] = 1050; D_80177D40[0] = 1050;
gPlayer[0].wings.rightState = WINGSTATE_INTACT; gPlayer[0].wings.rightState = WINGSTATE_INTACT;
@ -2119,7 +2119,7 @@ void func_80067F6C(Item* item) {
item->obj.id = OBJ_ITEM_WING_REPAIR; item->obj.id = OBJ_ITEM_WING_REPAIR;
Object_SetInfo(&item->info, item->obj.id); Object_SetInfo(&item->info, item->obj.id);
item->timer_48 = 2000; item->timer_48 = 2000;
Audio_PlaySfx(0x1900302B, item->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900302B, item->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
func_80067BEC(item); func_80067BEC(item);
} }
@ -2247,7 +2247,8 @@ void func_80068688(Item* item) {
item->state = 1; item->state = 1;
item->unk_44 = 255; item->unk_44 = 255;
gPlayer[item->playerNum].timer_27C = 100; gPlayer[item->playerNum].timer_27C = 100;
Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (D_80177E80 == 0) { if (D_80177E80 == 0) {
gPlayer[0].unk_110 = 0.0f; gPlayer[0].unk_110 = 0.0f;
} }
@ -2255,7 +2256,7 @@ void func_80068688(Item* item) {
if (D_80177E80 >= 7) { if (D_80177E80 >= 7) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8;
gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_1D0 = 0;
Audio_PlaySfx(0x1900602A, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900602A, gDefaultSfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177930 = 2; D_80177930 = 2;
D_800D3180[gCurrentLevel] = 1; D_800D3180[gCurrentLevel] = 1;
} }
@ -2307,7 +2308,7 @@ void func_80068914(Item* item) {
for (i = 1; i < 4; i++) { for (i = 1; i < 4; i++) {
gSavedTeamShields[i] = gTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i];
} }
Audio_PlaySfx(0x4900400F, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900400F, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }

77
src/main/fox_enmy2.c
View file

@ -204,7 +204,7 @@ void func_8006AD18(Actor* actor) {
} else { } else {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D1E0(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 5.0f); func_8007D1E0(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 5.0f);
} }
} }
@ -259,7 +259,7 @@ void func_8006B0A0(Actor* actor) {
D_80176B98[actor->unk_046][temp_hi], 4.0f); D_80176B98[actor->unk_046][temp_hi], 4.0f);
} }
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_04A++; actor->unk_04A++;
if (actor->unk_04A > 15) { if (actor->unk_04A > 15) {
@ -334,7 +334,7 @@ void func_8006B95C(Object_80* obj80) {
if (obj80->obj.pos.y < gGroundLevel + 40.0f) { if (obj80->obj.pos.y < gGroundLevel + 40.0f) {
obj80->obj.pos.y = gGroundLevel + 40.0f; obj80->obj.pos.y = gGroundLevel + 40.0f;
Audio_PlaySfx(0x19130003, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
obj80->state = 2; obj80->state = 2;
obj80->vel.y = 0.0f; obj80->vel.y = 0.0f;
} }
@ -512,10 +512,12 @@ void func_8006C008(Actor* actor) {
if (actor->unk_04A & 4) { if (actor->unk_04A & 4) {
switch (actor->unk_046) { switch (actor->unk_046) {
case 2: case 2:
Audio_PlaySfx(0x19000024, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000024, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
break; break;
case 25: case 25:
Audio_PlaySfx(0x29003031, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29003031, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
break; break;
} }
} }
@ -1068,7 +1070,8 @@ void func_8006D36C(Actor* actor) {
D_80176B98[i][j] = actor->obj.pos.z; D_80176B98[i][j] = actor->obj.pos.z;
} }
if (actor->unk_0B4 == 200) { if (actor->unk_0B4 == 200) {
Audio_PlaySfx(0x11032049, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11032049, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
break; break;
} }
@ -1125,26 +1128,27 @@ void func_8006D36C(Actor* actor) {
case 1: case 1:
if ((gCurrentLevel != LEVEL_SOLAR) && (actor->unk_0B4 != 6) && if ((gCurrentLevel != LEVEL_SOLAR) && (actor->unk_0B4 != 6) &&
((gCurrentLevel != LEVEL_CORNERIA) || (actor->unk_0B4 != 8))) { ((gCurrentLevel != LEVEL_CORNERIA) || (actor->unk_0B4 != 8))) {
Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
break; break;
case 2: case 2:
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 3: case 3:
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 4: case 4:
Audio_PlaySfx(0x31012039, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31012039, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 5: case 5:
Audio_PlaySfx(0x1900302B, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900302B, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 6: case 6:
Audio_PlaySfx(0x31000014, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000014, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 7: case 7:
Audio_PlaySfx(0x31000015, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000015, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
@ -1553,7 +1557,7 @@ void func_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
effect->timer_50 = 20; effect->timer_50 = 20;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
Audio_PlaySfx(0x2900201D, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8006EB64(f32 xPos, f32 yPos, f32 zPos) { void func_8006EB64(f32 xPos, f32 yPos, f32 zPos) {
@ -1578,7 +1582,7 @@ void func_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->info.unk_16 = 2; actor->info.unk_16 = 2;
Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_8006EC60(f32 xPos, f32 yPos, f32 zPos) { void func_8006EC60(f32 xPos, f32 yPos, f32 zPos) {
@ -1622,17 +1626,17 @@ void func_8006ECBC(PlayerShotId objId, PlayerShot* shot, s32 unk0E4, f32 xPos, f
if (gLevelMode == LEVELMODE_ALL_RANGE) { if (gLevelMode == LEVELMODE_ALL_RANGE) {
if (unk0E4 + 100 < 104) { if (unk0E4 + 100 < 104) {
Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if ((unk0E4 < 60) && (gActors[unk0E4].obj.id == OBJ_ACTOR_200) && (gActors[unk0E4].iwork[12] > 0)) { } else if ((unk0E4 < 60) && (gActors[unk0E4].obj.id == OBJ_ACTOR_200) && (gActors[unk0E4].iwork[12] > 0)) {
Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900000D, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (unk0E4 + 100 == 200) { } else if (unk0E4 + 100 == 200) {
shot->playerNum = 100; shot->playerNum = 100;
Audio_PlaySfx(0x19030037, shot->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030037, shot->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002, shot->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1957,7 +1961,7 @@ void func_8006FEEC(Actor* actor) {
func_8007A6F0(&actor->obj.pos, 0x29018036); func_8007A6F0(&actor->obj.pos, 0x29018036);
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f);
} else { } else {
Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -2027,9 +2031,9 @@ void func_800701E0(Actor* actor) {
if (actor->unk_0B4 != 83) { if (actor->unk_0B4 != 83) {
if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) { if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) {
Audio_PlaySfx(0x29018036, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29018036, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903700B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->obj.status = OBJ_DYING; actor->obj.status = OBJ_DYING;
@ -2117,18 +2121,18 @@ void func_800701E0(Actor* actor) {
} }
if (actor->unk_0B4 == 0x52) { if (actor->unk_0B4 == 0x52) {
Audio_PlaySfx(0x11000055, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000055, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 1; actor->unk_0D0 = 1;
func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 0x3C); func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 0x3C);
} }
} else { } else {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) { if ((actor->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) {
Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (actor->health < 20) { } else if (actor->health < 20) {
Audio_PlaySfx(0x2943500F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0x3D) && (actor->unk_0B4 != 0x53)) { if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0x3D) && (actor->unk_0B4 != 0x53)) {
@ -2213,14 +2217,14 @@ void func_80070BA8(Actor* actor) {
func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.2f, 10); actor->vel.z, 0.2f, 10);
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x29033064, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033064, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->info.bonus); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->info.bonus);
gHitCount += actor->info.bonus + 1; gHitCount += actor->info.bonus + 1;
D_80177850 = 15; D_80177850 = 15;
} }
} else { } else {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -2782,7 +2786,7 @@ void func_80071DC0(Actor* actor) {
} }
if (!(gGameFrameCount & 0xF)) { if (!(gGameFrameCount & 0xF)) {
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->vel.y -= 0.1f; actor->vel.y -= 0.1f;
@ -2818,9 +2822,9 @@ void func_800720E8(Actor* actor) {
if (actor->health <= 0) { if (actor->health <= 0) {
actor->unk_046 = 1; actor->unk_046 = 1;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032408); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032408);
Audio_PlaySfx(0x1900000D, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000D, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
} }
@ -2964,7 +2968,7 @@ void func_80072594(Actor* actor) {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x29034041, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034041, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->timer_0C6 = 200; actor->timer_0C6 = 200;
@ -3355,9 +3359,9 @@ void func_80072594(Actor* actor) {
(actor->unk_0B4 != 0x31) && (actor->unk_0B4 != 0x32)) { (actor->unk_0B4 != 0x31) && (actor->unk_0B4 != 0x32)) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if (gCurrentLevel == LEVEL_METEO) { if (gCurrentLevel == LEVEL_METEO) {
Audio_PlaySfx(0x2902107D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902107D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -3400,7 +3404,8 @@ void func_80072594(Actor* actor) {
spF0 = 350.0f; spF0 = 350.0f;
if (!(gGameFrameCount & 3)) { if (!(gGameFrameCount & 3)) {
func_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y); func_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y);
Audio_PlaySfx(0x19800017, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19800017, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} }

38
src/main/fox_hud.c
View file

@ -852,7 +852,7 @@ void func_80086DCC(void) {
} }
if ((D_80177840 == 92) || (D_80177840 == 87) || (D_80177840 == 82) || (D_80177840 == 77)) { if ((D_80177840 == 92) || (D_80177840 == 87) || (D_80177840 == 82) || (D_80177840 == 77)) {
Audio_PlaySfx(0x49008031U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008031U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
if (D_80177840 <= 100) { if (D_80177840 <= 100) {
@ -879,9 +879,9 @@ void func_80086DCC(void) {
if ((D_80177840 == 80) || (D_80177840 == 72) || (D_80177840 == 64) || (D_80177840 == 56)) { if ((D_80177840 == 80) || (D_80177840 == 72) || (D_80177840 == 64) || (D_80177840 == 56)) {
if (!boolTemp) { if (!boolTemp) {
Audio_PlaySfx(0x49008034U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008034U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x49008031U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008031U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1138,7 +1138,7 @@ void func_80087B5C(void) {
if (((gTeamShields[1] > 0) && (gTeamShields[1] < 255)) && if (((gTeamShields[1] > 0) && (gTeamShields[1] < 255)) &&
((gTeamShields[2] > 0) && (gTeamShields[2] < 255)) && ((gTeamShields[2] > 0) && (gTeamShields[2] < 255)) &&
((gTeamShields[3] > 0) && (gTeamShields[3] < 255))) { ((gTeamShields[3] > 0) && (gTeamShields[3] < 255))) {
Audio_PlaySfx(0x41007012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x41007012U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_801617C0[0] = 2; D_801617C0[0] = 2;
@ -1151,7 +1151,7 @@ void func_80087B5C(void) {
} }
if (D_801617C0[5] > 0) { if (D_801617C0[5] > 0) {
Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49004007U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_801617C0[5] >= 100) { if (D_801617C0[5] >= 100) {
D_801617C0[5] -= 100; D_801617C0[5] -= 100;
@ -1209,7 +1209,7 @@ void func_80087B5C(void) {
D_801617C0[0]++; D_801617C0[0]++;
} else { } else {
if (!(gGameFrameCount & 1)) { if (!(gGameFrameCount & 1)) {
Audio_PlaySfx(0x4900C024U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900C024U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801617C0[3]++; D_801617C0[3]++;
} }
} }
@ -1481,7 +1481,7 @@ void func_80088970(void) {
D_80161838[0] = 0; D_80161838[0] = 0;
if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) { if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) {
D_80161810[1] ^= 1; D_80161810[1] ^= 1;
Audio_PlaySfx(0x49000002U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1875,7 +1875,7 @@ void func_80089D28(void) {
if ((gb == 10) || (gb == 0)) { if ((gb == 10) || (gb == 0)) {
// clang-format off // clang-format off
//! FAKE: Probably a MACRO //! FAKE: Probably a MACRO
if (1) {Audio_PlaySfx(0x4900001c, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);} if (1) {Audio_PlaySfx(0x4900001c, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);}
// clang-format on // clang-format on
} }
@ -2307,7 +2307,7 @@ void func_8008B044(void) {
return; return;
} }
Audio_PlaySfx(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49002018, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_800CFF90 != 0) { if (D_800CFF90 != 0) {
func_8001AF40(1); func_8001AF40(1);
@ -2320,7 +2320,7 @@ void func_8008B044(void) {
D_80161790++; D_80161790++;
if (D_80161790 >= 7) { if (D_80161790 >= 7) {
if (D_80161794 & 1) { if (D_80161794 & 1) {
Audio_PlaySfx(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49002018, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_80161790 = 0; D_80161790 = 0;
D_80161794++; D_80161794++;
@ -3125,7 +3125,7 @@ void func_8008DE68(void) {
if ((gShowBossHealth == 1) && (gTeamShields[2] > 0)) { if ((gShowBossHealth == 1) && (gTeamShields[2] > 0)) {
if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) { if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) {
Audio_PlaySfx(0x4900C028, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900C028, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801616BC = 255.0f; D_801616BC = 255.0f;
} }
@ -3769,8 +3769,8 @@ s32 func_80090200(Boss* boss) {
switch (boss->swork[1]) { switch (boss->swork[1]) {
case 0: case 0:
Audio_PlaySfx(0x11000011U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000011U, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x3140402EU, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3140402EU, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
@ -4363,7 +4363,7 @@ bool func_80091CF8(Actor* actor) {
if (actor->iwork[1] != 0) { if (actor->iwork[1] != 0) {
if (actor->fwork[10] < 0.1f) { if (actor->fwork[10] < 0.1f) {
actor->fwork[10] = 20.0f; actor->fwork[10] = 20.0f;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
actor->iwork[1] = 0; actor->iwork[1] = 0;
@ -4412,7 +4412,7 @@ bool func_80091F00(Actor* actor) {
} }
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f);
Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0); Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0);
@ -4744,7 +4744,7 @@ void func_80092D48(Actor* actor) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
} }
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (((D_800D1970 & 3) == 2) && (gCurrentLevel == LEVEL_SECTOR_X)) { if (((D_800D1970 & 3) == 2) && (gCurrentLevel == LEVEL_SECTOR_X)) {
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
@ -4890,7 +4890,7 @@ void func_80093310(void) {
if (1) {} if (1) {}
this->obj.id = OBJ_ACTOR_195; this->obj.id = OBJ_ACTOR_195;
Object_SetInfo(&this->info, this->obj.id); Object_SetInfo(&this->info, this->obj.id);
Audio_PlaySfx(0x11030010, this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, this->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) { void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
@ -5194,7 +5194,7 @@ void func_800935E8(Player* player) {
} }
if (player->timer_1F8 == 774) { if (player->timer_1F8 == 774) {
Audio_PlaySfx(0x01038026U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01038026U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177A10[9] = 40; D_80177A10[9] = 40;
} }
@ -6114,7 +6114,7 @@ void func_80096A74(Player* player) {
player->unk_190 = player->unk_194 = 10.0f; player->unk_190 = player->unk_194 = 10.0f;
player->unk_1D0 = 2; player->unk_1D0 = 2;
D_80177A48[1] = 400.0f; D_80177A48[1] = 400.0f;
Audio_PlaySfx(0x09004002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09004002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;

52
src/main/fox_play.c
View file

@ -233,7 +233,7 @@ void func_800A4C40(Player* player) {
if ((sp30.y < gGroundLevel + 80.0f) || (sp3C.y < gGroundLevel + 80.0f)) { if ((sp30.y < gGroundLevel + 80.0f) || (sp3C.y < gGroundLevel + 80.0f)) {
if (D_80161A64 == 0) { if (D_80161A64 == 0) {
D_80161A64 = 1; D_80161A64 = 1;
Audio_PlaySfx(0x1100000B, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1100000B, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
D_80161A64 = 0; D_80161A64 = 0;
@ -476,7 +476,7 @@ void func_800A594C(void) {
if (D_8017782C == 0) { if (D_8017782C == 0) {
if (gCurrentLevel == LEVEL_SOLAR) { if (gCurrentLevel == LEVEL_SOLAR) {
func_8001D1C8(0xFF, 1); func_8001D1C8(0xFF, 1);
Audio_PlaySfx(0x4100C023, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4100C023, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001A55C(gPlayer[0].sfxPos, 0x3140807E); func_8001A55C(gPlayer[0].sfxPos, 0x3140807E);
} }
} else if (gCurrentLevel == LEVEL_AQUAS) { } else if (gCurrentLevel == LEVEL_AQUAS) {
@ -551,18 +551,18 @@ void func_800A5EBC(void) {
void func_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) { void func_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) {
if (!gVersusMode) { if (!gVersusMode) {
Audio_PlaySfx(sfxId, sfxSrc, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, sfxSrc, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(sfxId, sfxSrc, mode, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, sfxSrc, mode, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
void func_800A6028(f32* sfxSrc, u32 sfxId) { void func_800A6028(f32* sfxSrc, u32 sfxId) {
Audio_PlaySfx(sfxId, sfxSrc, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, sfxSrc, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_800A6070(f32* sfxSrc, u32 sfxId) { void func_800A6070(f32* sfxSrc, u32 sfxId) {
Audio_PlaySfx(sfxId, sfxSrc, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfxId, sfxSrc, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void BonusText_Initialize(BonusText* bonus) { void BonusText_Initialize(BonusText* bonus) {
@ -827,9 +827,9 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) {
} else { } else {
if (player->shields != 0) { if (player->shields != 0) {
if (player->shields < 50) { if (player->shields < 50) {
Audio_PlaySfx(0x49008011, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008011, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (player->shields < 100) { } else if (player->shields < 100) {
Audio_PlaySfx(0x49008010, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008010, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (damage < 25) { if (damage < 25) {
@ -1741,7 +1741,8 @@ void func_800A8BA4(Player* player) {
player->unk_23C = 80; player->unk_23C = 80;
} }
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
@ -1749,7 +1750,8 @@ void func_800A8BA4(Player* player) {
} }
} else if (obj80->obj.id == OBJ_80_54) { } else if (obj80->obj.id == OBJ_80_54) {
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19832019, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
@ -1844,7 +1846,8 @@ void func_800A8BA4(Player* player) {
if (temp_v0 != 0) { if (temp_v0 != 0) {
if (temp_v0 < 0) { if (temp_v0 < 0) {
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
@ -1905,13 +1908,15 @@ void func_800A8BA4(Player* player) {
if (D_80177E80 == 3) { if (D_80177E80 == 3) {
Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO);
} }
Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &D_800C5D34, Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &gDefaultScale,
&D_800C5D34, &D_800C5D3C); &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008025, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} else if (temp_v0 < 0) { } else if (temp_v0 < 0) {
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
@ -1943,7 +1948,8 @@ void func_800A8BA4(Player* player) {
if (temp_v0 != 0) { if (temp_v0 != 0) {
if (temp_v0 < 0) { if (temp_v0 < 0) {
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
@ -5317,9 +5323,9 @@ void func_800B48BC(Player* player) {
if ((!gVersusMode || (D_80177E7C != 0)) && (player->unk_4DC == 0) && (gInputPress->button & U_CBUTTONS) && if ((!gVersusMode || (D_80177E7C != 0)) && (player->unk_4DC == 0) && (gInputPress->button & U_CBUTTONS) &&
((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) { ((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) {
if (player->unk_238 = 1 - player->unk_238) { if (player->unk_238 = 1 - player->unk_238) {
Audio_PlaySfx(0x4900002C, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900002C, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x4900002D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900002D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (gLevelMode == LEVELMODE_ON_RAILS) { if (gLevelMode == LEVELMODE_ON_RAILS) {
player->unk_034 = 0.0f; player->unk_034 = 0.0f;
} }
@ -6154,7 +6160,7 @@ void func_800B79B0(void) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8;
gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_1D0 = 0;
gOverlayStage = 1; gOverlayStage = 1;
Audio_PlaySfx(0x1900602A, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900602A, gDefaultSfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177930 = 2; D_80177930 = 2;
D_800D3180[gCurrentLevel] = 1; D_800D3180[gCurrentLevel] = 1;
} }
@ -6208,9 +6214,9 @@ void func_800B79B0(void) {
} }
if (gPlayer[0].heal == 0) { if (gPlayer[0].heal == 0) {
if (gPlayer[0].shields == 50) { if (gPlayer[0].shields == 50) {
Audio_PlaySfx(0x49008011, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008011, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (gPlayer[0].shields == 100) { } else if (gPlayer[0].shields == 100) {
Audio_PlaySfx(0x49008010, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008010, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -6423,9 +6429,9 @@ void func_800B86CC(void) {
if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) && if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) &&
(gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
if (D_800D2860[0] = 1 - D_800D2860[0]) { if (D_800D2860[0] = 1 - D_800D2860[0]) {
Audio_PlaySfx(0x49000019, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000019, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x4900101A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101A, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} else { } else {

3
src/main/fox_radio.c
View file

@ -593,7 +593,8 @@ void func_800BB5D0(void) {
if ((D_801782E8 >= 23000) && (D_801782E8 < 23033)) { if ((D_801782E8 >= 23000) && (D_801782E8 < 23033)) {
if (D_801782F8 != 0) { if (D_801782F8 != 0) {
D_Timer_801782B4 = 2; D_Timer_801782B4 = 2;
Audio_PlaySfx(0x49000017, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000017, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} else if (temp_v0 == 1) { } else if (temp_v0 == 1) {
D_Timer_801782B4 = 2; D_Timer_801782B4 = 2;

2
src/main/fox_std_lib.c
View file

@ -129,7 +129,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton) { s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton) {
s32 i = 1; s32 i = 1;
for (i = 1; *skeleton != 0; i++, skeleton++) { for (i = 1; *skeleton != NULL; i++, skeleton++) {
if (*skeleton == limb) { if (*skeleton == limb) {
return i; return i;
} }

26
src/main/fox_tank.c
View file

@ -323,7 +323,7 @@ void func_800444BC(Player* player) {
} }
if ((player->pos.y - sp30) < sp38) { if ((player->pos.y - sp30) < sp38) {
if (player->vel.y < -10.0f) { if (player->vel.y < -10.0f) {
Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09008015, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_1D4 = 1; player->unk_1D4 = 1;
if (player->vel.y < -20.0f) { if (player->vel.y < -20.0f) {
@ -515,7 +515,7 @@ void func_80045130(Player* player) {
player->unk_1F0 = 20; player->unk_1F0 = 20;
player->unk_1EC = 20; player->unk_1EC = 20;
player->unk_494 = 1; player->unk_494 = 1;
Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
player->timer_1E0 = 10; player->timer_1E0 = 10;
} }
@ -528,7 +528,7 @@ void func_80045130(Player* player) {
player->unk_1F0 = -20; player->unk_1F0 = -20;
player->unk_1EC = -20; player->unk_1EC = -20;
player->unk_494 = 1; player->unk_494 = 1;
Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1100000A, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
player->timer_1E4 = 10; player->timer_1E4 = 10;
} }
@ -552,7 +552,7 @@ void func_80045348(Player* player) {
sp2E = true; sp2E = true;
if (D_800C9F24 == 0.0f) { if (D_800C9F24 == 0.0f) {
player->unk_190 = player->unk_194 = 4.0f; player->unk_190 = player->unk_194 = 4.0f;
Audio_PlaySfx(0x0900402F, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0900402F, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
} }
@ -600,7 +600,7 @@ void func_80045678(Player* player) {
if ((gInputHold->button & Z_TRIG) && !player->unk_2B4) { if ((gInputHold->button & Z_TRIG) && !player->unk_2B4) {
D_800C9F14++; D_800C9F14++;
if (D_800C9F20 == 0.0f) { if (D_800C9F20 == 0.0f) {
Audio_PlaySfx(0x01004024, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01004024, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->unk_12C += 4.0f; player->unk_12C += 4.0f;
@ -630,7 +630,7 @@ void func_80045678(Player* player) {
if ((gInputHold->button & R_TRIG) && !player->unk_2B4) { if ((gInputHold->button & R_TRIG) && !player->unk_2B4) {
D_800C9F14++; D_800C9F14++;
if (player->unk_2C0 == 0.0f) { if (player->unk_2C0 == 0.0f) {
Audio_PlaySfx(0x01004024, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01004024, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->unk_12C -= 4.0f; player->unk_12C -= 4.0f;
@ -659,7 +659,7 @@ void func_80045678(Player* player) {
D_800C9F3C = 1; D_800C9F3C = 1;
func_8001A55C(player->sfxPos, 0x1100000A); func_8001A55C(player->sfxPos, 0x1100000A);
func_8001A55C(player->sfxPos, 0x01004024); func_8001A55C(player->sfxPos, 0x01004024);
Audio_PlaySfx(0x01008016, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01008016, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_12C += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f; player->unk_12C += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f;
temp = -gInputPress->stick_y; temp = -gInputPress->stick_y;
@ -938,7 +938,7 @@ void func_80046704(Player* player) {
player->unk_0D0 = -(D_800C9F00 * 1.5f); player->unk_0D0 = -(D_800C9F00 * 1.5f);
player->vel.z = D_800C9F00 * 1.5f; player->vel.z = D_800C9F00 * 1.5f;
D_800C9F00 = 12; D_800C9F00 = 12;
Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09008015, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
if (obj80->obj.id == OBJ_80_59) { if (obj80->obj.id == OBJ_80_59) {
@ -1249,7 +1249,7 @@ void func_80047D38(Player* player, f32 arg1) {
} }
if ((player->pos.y - 5.0f) < arg1) { if ((player->pos.y - 5.0f) < arg1) {
if (player->vel.y < -10.0f) { if (player->vel.y < -10.0f) {
Audio_PlaySfx(0x09008015, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09008015, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_1F4 = 10; player->unk_1F4 = 10;
} }
D_800C9F04 = 1; D_800C9F04 = 1;
@ -1296,7 +1296,7 @@ void func_80047FBC(Player* player) {
Math_SmoothStepToF(&player->unk_0EC, -((player->vel.z / 5.0f) * 4.0f), 0.4f, 8.0f, 0.01f); Math_SmoothStepToF(&player->unk_0EC, -((player->vel.z / 5.0f) * 4.0f), 0.4f, 8.0f, 0.01f);
if (player->unk_0EC >= 3.0f) { if (player->unk_0EC >= 3.0f) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) {
Audio_PlaySfx(0x19000065, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000065, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_800C9F08 |= 1; D_800C9F08 |= 1;
} }
@ -1361,14 +1361,16 @@ void func_800481F4(Player* player) {
D_80178578 = 20; D_80178578 = 20;
player->unk_23C = 80; player->unk_23C = 80;
if (player->unk_22C == 0) { if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, player->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
player->unk_22C += 2; player->unk_22C += 2;
if (player->unk_22C >= 4) { if (player->unk_22C >= 4) {
player->unk_22C = 4; player->unk_22C = 4;
} }
} else if (temp_v0 == -2) { } else if (temp_v0 == -2) {
Audio_PlaySfx(0x19000001, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, player->sfxPos, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} else { } else {
Player_ApplyDamage(player, temp_v0, obj80->info.damage); Player_ApplyDamage(player, temp_v0, obj80->info.damage);

22
src/main/fox_versus.c
View file

@ -333,7 +333,7 @@ void func_800BDE44(void) {
} else { } else {
D_80178810[i] = 0; D_80178810[i] = 0;
} }
Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49004007U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -362,12 +362,12 @@ s32 func_800BE078(void) {
if ((D_80178768[1] -= temp) >= 0) { if ((D_80178768[1] -= temp) >= 0) {
if ((D_80178768[0] == 0) && (D_80178768[1] < 15) && (D_80178768[1] >= 0)) { if ((D_80178768[0] == 0) && (D_80178768[1] < 15) && (D_80178768[1] >= 0)) {
Audio_PlaySfx(0x4900C02AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900C02AU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
// clang-format off // clang-format off
if (D_80178768[0] == 0) { Audio_PlaySfx(0x4900D036U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (D_80178768[0] == 0) { Audio_PlaySfx(0x4900D036U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb); }
// clang-format on // clang-format on
D_80178768[1] *= -1; D_80178768[1] *= -1;
temp = (D_80178768[1] / 60) + 1; temp = (D_80178768[1] / 60) + 1;
@ -463,19 +463,19 @@ s32 func_800BE564(void) {
} }
if ((sUnlockLandmaster) && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) { if ((sUnlockLandmaster) && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) {
Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178780[i] = 2; D_80178780[i] = 2;
} }
if ((sUnlockOnFoot) && (D_80178780[i] == 0) && if ((sUnlockOnFoot) && (D_80178780[i] == 0) &&
((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) || ((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) ||
(gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) { (gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) {
Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178780[i] = 3; D_80178780[i] = 3;
} }
if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) { if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) {
Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178780[i] = 1; D_80178780[i] = 1;
} }
@ -598,10 +598,10 @@ s32 func_800BEF00(void) {
if (D_80178794 == 0) { if (D_80178794 == 0) {
D_80178790--; D_80178790--;
if (D_80178790 != 0) { if (D_80178790 != 0) {
Audio_PlaySfx(0x49000008U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000008U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
ret = 0; ret = 0;
} else { } else {
Audio_PlaySfx(0x49000009U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000009U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
ret = 1; ret = 1;
} }
D_80178794 = 30; D_80178794 = 30;
@ -1129,7 +1129,7 @@ s32 func_800C07C4(void) {
} }
// clang-format off // clang-format off
if (ret != 0) { Audio_PlaySfx(0x49000002U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (ret != 0) { Audio_PlaySfx(0x49000002U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb); }
// clang-format on // clang-format on
return ret; return ret;
@ -1255,7 +1255,7 @@ bool func_800C0D10(void) {
if (cont == 4) { if (cont == 4) {
D_800D4A90 = 2; D_800D4A90 = 2;
} else { } else {
Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49004007U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -1306,7 +1306,7 @@ s32 func_800C0E78(void) {
bool func_800C107C(s32 arg0) { bool func_800C107C(s32 arg0) {
D_80178798++; D_80178798++;
if (D_80178798 == 10) { if (D_80178798 == 10) {
Audio_PlaySfx(0x49004007U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49004007U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801787B8++; D_801787B8++;
D_80178798 = 0; D_80178798 = 0;
} }

6
src/main/sys_main.c
View file

@ -1,6 +1,6 @@
#include "sys.h" #include "sys.h"
void func_8000FFCC(void); void AudioLoad_Init(void);
SPTask* func_8001DF50(void); SPTask* func_8001DF50(void);
void func_8001DCE0(void); void func_8001DCE0(void);
void func_8001DECC(void); void func_8001DECC(void);
@ -107,7 +107,7 @@ void Main_Initialize(void) {
void Audio_ThreadEntry(void* arg0) { void Audio_ThreadEntry(void* arg0) {
SPTask* task; SPTask* task;
func_8000FFCC(); AudioLoad_Init();
func_8001DCE0(); func_8001DCE0();
task = func_8001DF50(); task = func_8001DF50();
if (task != NULL) { if (task != NULL) {
@ -145,7 +145,7 @@ void Graphics_SetTask(void) {
gGfxTask->task.t.dram_stack = gDramStack; gGfxTask->task.t.dram_stack = gDramStack;
gGfxTask->task.t.dram_stack_size = SP_DRAM_STACK_SIZE8; gGfxTask->task.t.dram_stack_size = SP_DRAM_STACK_SIZE8;
gGfxTask->task.t.output_buff = (u64*) gTaskOutputBuffer; gGfxTask->task.t.output_buff = (u64*) gTaskOutputBuffer;
gGfxTask->task.t.output_buff_size = (u64*) gAudioDataBuffer; gGfxTask->task.t.output_buff_size = (u64*) gAudioHeap;
gGfxTask->task.t.data_ptr = (u64*) gGfxPool->masterDL; gGfxTask->task.t.data_ptr = (u64*) gGfxPool->masterDL;
gGfxTask->task.t.data_size = (gMasterDisp - gGfxPool->masterDL) * sizeof(Gfx); gGfxTask->task.t.data_size = (gMasterDisp - gGfxPool->masterDL) * sizeof(Gfx);
gGfxTask->task.t.yield_data_ptr = (u64*) &gOSYieldData; gGfxTask->task.t.yield_data_ptr = (u64*) &gOSYieldData;

8
src/mods/sfxjukebox.c
View file

@ -79,7 +79,7 @@ void Option_ExpertSoundUpdate(void) {
sfx |= sfxId & 0xFF; sfx |= sfxId & 0xFF;
if (prevSfx != sfx) { if (prevSfx != sfx) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
prevSfx = sfx; prevSfx = sfx;
} }
@ -88,7 +88,7 @@ void Option_ExpertSoundUpdate(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
Audio_PlaySfx(sfx, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(sfx, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9320 = true; D_menu_801B9320 = true;
} }
@ -100,8 +100,8 @@ void Option_ExpertSoundUpdate(void) {
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9244 = 1; D_menu_801B9244 = 1;
} else { } else {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_KillSfx(D_800C5D28); Audio_KillSfx(gDefaultSfxPos);
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
D_menu_801B9320 = false; D_menu_801B9320 = false;

2
src/overlays/ovl_ending/fox_end1.c
View file

@ -435,7 +435,7 @@ void func_ending_8018845C(void);
s32 func_ending_80188634(void) { s32 func_ending_80188634(void) {
if (D_80161690 != 0) { if (D_80161690 != 0) {
if ((D_ending_80196F90 % 14) == 0) { if ((D_ending_80196F90 % 14) == 0) {
Audio_PlaySfx(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49002018, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_ending_80196F90++; D_ending_80196F90++;
D_80161690--; D_80161690--;

2
src/overlays/ovl_ending/fox_end2.c
View file

@ -712,7 +712,7 @@ void func_ending_80190CF0(u32 arg0, AssetInfo* asset) {
} }
if (arg0 == asset->unk_0C) { if (arg0 == asset->unk_0C) {
Audio_PlaySfx(0x1940306EU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306EU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
RCP_SetupDL(&gMasterDisp, asset->unk_08); RCP_SetupDL(&gMasterDisp, asset->unk_08);

91
src/overlays/ovl_i1/fox_co.c
View file

@ -153,7 +153,7 @@ void func_i1_80187AC8(Boss* boss) {
boss->swork[10] = 1000; boss->swork[10] = 1000;
boss->info.hitbox[1 + 0] = 100000.0f; boss->info.hitbox[1 + 0] = 100000.0f;
func_i1_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f); func_i1_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f);
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
if (fabsf(boss->obj.rot.x) < 20.0f) { if (fabsf(boss->obj.rot.x) < 20.0f) {
boss->swork[32] = 1; boss->swork[32] = 1;
@ -221,7 +221,7 @@ void func_i1_80187AC8(Boss* boss) {
func_i1_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f); func_i1_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f);
} }
} else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) { } else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) {
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[23] = 200; boss->swork[23] = 200;
if (boss->dmgPart == 4) { if (boss->dmgPart == 4) {
boss->swork[24] -= boss->damage; boss->swork[24] -= boss->damage;
@ -451,7 +451,7 @@ void func_i1_80188C7C(Boss* boss) {
if (boss->unk_044 == 0) { if (boss->unk_044 == 0) {
boss->unk_044++; boss->unk_044++;
boss->fwork[12] *= -0.2f; boss->fwork[12] *= -0.2f;
Audio_PlaySfx(0x19030004, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030004, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f); func_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f);
boss->swork[18] = 13; boss->swork[18] = 13;
boss->swork[19] = 15; boss->swork[19] = 15;
@ -483,7 +483,7 @@ void func_i1_80188D50(Boss* boss) {
(fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 200.0f) && (gPlayer[0].unk_4D8 > 180.0f)) { (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 200.0f) && (gPlayer[0].unk_4D8 > 180.0f)) {
boss->swork[36]++; boss->swork[36]++;
D_i1_801997E0 = 20; D_i1_801997E0 = 20;
Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008025, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0)) { if ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0)) {
do { do {
do { do {
@ -936,7 +936,7 @@ void func_i1_80189058(Boss* boss) {
boss->swork[31] = 0; boss->swork[31] = 0;
} }
if ((boss->state != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) { if ((boss->state != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) {
Audio_PlaySfx(0x29022019U, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022019U, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gPlayer[0].unk_4DC != 0) && (boss->state != 0)) { if ((gPlayer[0].unk_4DC != 0) && (boss->state != 0)) {
boss->state = 0; boss->state = 0;
@ -1130,7 +1130,7 @@ void func_i1_8018ACE0(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if (actor->unk_0D2 == 0) { if (actor->unk_0D2 == 0) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.1f, 20); actor->vel.z, 0.1f, 20);
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
@ -1273,7 +1273,7 @@ void func_i1_8018B15C(Actor* actor) {
obj80->vel.x = sp48.x; obj80->vel.x = sp48.x;
obj80->vel.y = sp48.y; obj80->vel.y = sp48.y;
obj80->vel.z = sp48.z; obj80->vel.z = sp48.z;
Audio_PlaySfx(0x2902401C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -1347,7 +1347,7 @@ void func_i1_8018B58C(Actor* actor) {
actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f);
func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.1f, 10); actor->vel.z, 0.1f, 10);
Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
@ -1373,7 +1373,7 @@ void func_i1_8018B58C(Actor* actor) {
if (actor->timer_0BC == 8) { if (actor->timer_0BC == 8) {
func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, 0.0f, func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, 0.0f,
5.0f, 30); 5.0f, 30);
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 101: case 101:
@ -1483,7 +1483,7 @@ void func_i1_8018BE7C(Boss* boss) {
if (fabsf(gPlayer[0].unk_0AC) < 1.0f) { if (fabsf(gPlayer[0].unk_0AC) < 1.0f) {
boss->timer_05A = 30000; boss->timer_05A = 30000;
boss->obj.pos.z = (gPlayer[0].camEye.z - D_80177D20) - 2000.0f; boss->obj.pos.z = (gPlayer[0].camEye.z - D_80177D20) - 2000.0f;
Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B6D0 = 0; D_i1_8019B6D0 = 0;
} else { } else {
D_i1_8019B6D0 = 1; D_i1_8019B6D0 = 1;
@ -1492,7 +1492,7 @@ void func_i1_8018BE7C(Boss* boss) {
boss->obj.pos.z = gPlayer[0].unk_138 + 2000.0f; boss->obj.pos.z = gPlayer[0].unk_138 + 2000.0f;
boss->fwork[7] = boss->obj.pos.x; boss->fwork[7] = boss->obj.pos.x;
boss->fwork[5] = 30.0f; boss->fwork[5] = 30.0f;
Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31038018, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[10] = 3; boss->swork[10] = 3;
boss->swork[8] = 3; boss->swork[8] = 3;
} }
@ -1633,13 +1633,13 @@ void func_i1_8018C19C(Boss* boss) {
boss->health -= boss->damage; boss->health -= boss->damage;
if (boss->health < 120) { if (boss->health < 120) {
boss->fwork[17] = 2.8f; boss->fwork[17] = 2.8f;
Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
boss->vel.z = boss->fwork[18]; boss->vel.z = boss->fwork[18];
@ -1753,7 +1753,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->state = boss->swork[0]; boss->state = boss->swork[0];
boss->timer_050 = 60; boss->timer_050 = 60;
boss->fwork[8] = 0.0f; boss->fwork[8] = 0.0f;
Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 4: case 4:
@ -1765,7 +1765,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->timer_050 = 20; boss->timer_050 = 20;
boss->fwork[8] = 0.0f; boss->fwork[8] = 0.0f;
if (gBosses[1].state == 0) { if (gBosses[1].state == 0) {
Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((boss->swork[5] == 0) && ((gBosses[2].state == 0) || (gBosses[3].state == 0))) { if ((boss->swork[5] == 0) && ((gBosses[2].state == 0) || (gBosses[3].state == 0))) {
Radio_PlayMessage(gMsg_ID_2292, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2292, RCID_BOSS_CORNERIA2);
@ -1783,13 +1783,13 @@ void func_i1_8018C19C(Boss* boss) {
boss->fwork[13] = 20.0f; boss->fwork[13] = 20.0f;
if ((boss->fwork[0] > 60.0f) && (gBosses[2].state == 0) && (boss->swork[1] == 0)) { if ((boss->fwork[0] > 60.0f) && (gBosses[2].state == 0) && (boss->swork[1] == 0)) {
func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0);
Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0); func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0);
boss->swork[1] = 1; boss->swork[1] = 1;
} }
if ((boss->fwork[1] > 60.0f) && (gBosses[3].state == 0) && (boss->swork[2] == 0)) { if ((boss->fwork[1] > 60.0f) && (gBosses[3].state == 0) && (boss->swork[2] == 0)) {
func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0);
Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903201B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0); func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0);
boss->swork[2] = 1; boss->swork[2] = 1;
} }
@ -1811,7 +1811,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->swork[4]++; boss->swork[4]++;
boss->swork[4] &= 3; boss->swork[4] &= 3;
if ((gBosses[3].state == 0) && (gBosses[2].state == 0)) { if ((gBosses[3].state == 0) && (gBosses[2].state == 0)) {
Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1847,7 +1847,7 @@ void func_i1_8018C19C(Boss* boss) {
if ((boss->obj.rot.y < 20.0f) && (boss->obj.rot.y > -20.0f)) { if ((boss->obj.rot.y < 20.0f) && (boss->obj.rot.y > -20.0f)) {
if (boss->swork[9] == 0) { if (boss->swork[9] == 0) {
boss->swork[9]++; boss->swork[9]++;
Audio_PlaySfx(0x31034025, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31034025, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->swork[6] == 0) { if (boss->swork[6] == 0) {
Radio_PlayMessage(gMsg_ID_2293, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2293, RCID_BOSS_CORNERIA2);
} }
@ -1888,7 +1888,7 @@ void func_i1_8018C19C(Boss* boss) {
func_8001A55C(boss->sfxPos, 0x31034025); func_8001A55C(boss->sfxPos, 0x31034025);
func_800182F4(0x102800FF); func_800182F4(0x102800FF);
func_800182F4(0x112800FF); func_800182F4(0x112800FF);
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
gShowBossHealth = false; gShowBossHealth = false;
Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2);
@ -2018,7 +2018,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->fwork[16] = 4.0f; boss->fwork[16] = 4.0f;
if ((boss->swork[10] == 0) && (boss->state < 6)) { if ((boss->swork[10] == 0) && (boss->state < 6)) {
boss->fwork[17] = 1.8f; boss->fwork[17] = 1.8f;
Audio_PlaySfx(0x11020084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11020084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->timer_058 = 71; boss->timer_058 = 71;
boss->state = 6; boss->state = 6;
boss->fwork[12] = 0.0f; boss->fwork[12] = 0.0f;
@ -2056,7 +2056,7 @@ void func_i1_8018DDAC(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2067,7 +2067,8 @@ void func_i1_8018DDAC(Boss* boss) {
boss->info.unk_10 = 300.0f; boss->info.unk_10 = 300.0f;
gBosses[0].fwork[14] = 25.0f; gBosses[0].fwork[14] = 25.0f;
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2087,7 +2088,7 @@ void func_i1_8018DDAC(Boss* boss) {
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2122,7 +2123,7 @@ void func_i1_8018DDAC(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
func_i1_8018C0B0(boss); func_i1_8018C0B0(boss);
Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2150,7 +2151,7 @@ void func_i1_8018E290(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2162,7 +2163,8 @@ void func_i1_8018E290(Boss* boss) {
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
gBosses[0].fwork[14] = 335.0f; gBosses[0].fwork[14] = 335.0f;
boss->health = 0; boss->health = 0;
Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2180,7 +2182,7 @@ void func_i1_8018E290(Boss* boss) {
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2215,7 +2217,7 @@ void func_i1_8018E290(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
func_i1_8018C0B0(boss); func_i1_8018C0B0(boss);
Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2243,7 +2245,7 @@ void func_i1_8018E76C(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2255,7 +2257,8 @@ void func_i1_8018E76C(Boss* boss) {
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
gBosses[0].fwork[14] = 335.0f; gBosses[0].fwork[14] = 335.0f;
boss->health = 0; boss->health = 0;
Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C027, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2276,7 +2279,7 @@ void func_i1_8018E76C(Boss* boss) {
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2308,7 +2311,7 @@ void func_i1_8018E76C(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
func_i1_8018C0B0(boss); func_i1_8018C0B0(boss);
Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000014, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2407,10 +2410,10 @@ void func_i1_8018F044(Object_80* obj80) {
if (obj80->unk_44 >= 3) { if (obj80->unk_44 >= 3) {
obj80->state = 1; obj80->state = 1;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_603E924); obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_603E924);
Audio_PlaySfx(0x1900000D, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000D, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
Audio_PlaySfx(0x2903300E, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -2547,7 +2550,7 @@ void func_i1_8018F6F8(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->info.unk_10 = 200.0f; actor->info.unk_10 = 200.0f;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
extern Gfx D_30184D8[]; extern Gfx D_30184D8[];
@ -2696,10 +2699,10 @@ void func_i1_8018F880(Player* player) {
Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); Radio_PlayMessage(gMsg_ID_2005, RCID_FOX);
} }
if (player->timer_1F8 == 180) { if (player->timer_1F8 == 180) {
Audio_PlaySfx(0x09000007, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000007, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (player->timer_1F8 == 120) { if (player->timer_1F8 == 120) {
Audio_PlaySfx(0x09000013, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000013, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((player->timer_1F8 < 190) && (player->timer_1F8 >= 151)) { if ((player->timer_1F8 < 190) && (player->timer_1F8 >= 151)) {
Math_SmoothStepToF(&player->wings.unk_24, 2.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&player->wings.unk_24, 2.0f, 0.2f, 0.5f, 0.0f);
@ -3014,7 +3017,7 @@ void func_i1_80190F74(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_i1_80199B2C[arg1]; actor->obj.rot.z = D_i1_80199B2C[arg1];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i1_80191160(Player* player) { void func_i1_80191160(Player* player) {
@ -3142,7 +3145,7 @@ void func_i1_80191160(Player* player) {
if (gCsFrameCount == 1270) { if (gCsFrameCount == 1270) {
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_1D0++; player->unk_1D0++;
player->unk_0D0 = 2.0f; player->unk_0D0 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
@ -3229,7 +3232,7 @@ void func_i1_80191160(Player* player) {
gActors[0].state = 1; gActors[0].state = 1;
gActors[0].fwork[9] = 2.0f; gActors[0].fwork[9] = 2.0f;
gActors[0].timer_0BC = 50; gActors[0].timer_0BC = 50;
Audio_PlaySfx(0x09000002, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[0].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gActors[0].fwork[29] = 5.0f; gActors[0].fwork[29] = 5.0f;
} }
break; break;
@ -3238,7 +3241,7 @@ void func_i1_80191160(Player* player) {
gActors[1].state = 1; gActors[1].state = 1;
gActors[1].fwork[9] = 2.0f; gActors[1].fwork[9] = 2.0f;
gActors[1].timer_0BC = 50; gActors[1].timer_0BC = 50;
Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gActors[1].fwork[29] = 5.0f; gActors[1].fwork[29] = 5.0f;
} }
break; break;
@ -3247,7 +3250,7 @@ void func_i1_80191160(Player* player) {
gActors[2].state = 1; gActors[2].state = 1;
gActors[2].fwork[9] = 2.0f; gActors[2].fwork[9] = 2.0f;
gActors[2].timer_0BC = 50; gActors[2].timer_0BC = 50;
Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gActors[2].fwork[29] = 5.0f; gActors[2].fwork[29] = 5.0f;
} }
break; break;

4
src/overlays/ovl_i1/fox_tr.c
View file

@ -24,7 +24,7 @@ void func_i1_80198968(Item* item) {
if (item->obj.pos.z > (gPlayer[0].unk_138 + var_fv0)) { if (item->obj.pos.z > (gPlayer[0].unk_138 + var_fv0)) {
item->unk_44 = 1; item->unk_44 = 1;
PRINTF("♪:リング未通過音\n"); // Ring not passed sound PRINTF("♪:リング未通過音\n"); // Ring not passed sound
Audio_PlaySfx(0x4900402F, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900402F, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177E80 = 0; D_80177E80 = 0;
} }
} }
@ -33,7 +33,7 @@ void func_i1_80198968(Item* item) {
item->timer_48 = 50; item->timer_48 = 50;
item->info.unk_10 = 10000.0f; item->info.unk_10 = 10000.0f;
PRINTF("♪:リング通過音\n"); // Ring passing sound PRINTF("♪:リング通過音\n"); // Ring passing sound
Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008025, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177E80++; D_80177E80++;
if ((item->obj.rot.x != 0.0f) && (D_80177E80 >= 100)) { if ((item->obj.rot.x != 0.0f) && (D_80177E80 >= 100)) {
Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64);

2
src/overlays/ovl_i1/fox_tr360.c
View file

@ -200,7 +200,7 @@ void func_i1_8019949C(void) {
actor->unk_0C9 = actor->iwork[11] = 1; actor->unk_0C9 = actor->iwork[11] = 1;
actor->timer_0C2 = 30; actor->timer_0C2 = 30;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if ((i + 10) == 10) { if ((i + 10) == 10) {
actor->unk_0E6 = 0; actor->unk_0E6 = 0;
actor->health = 50; actor->health = 50;

63
src/overlays/ovl_i1/fox_ve1.c
View file

@ -415,7 +415,7 @@ void func_i1_80192518(Actor* actor) {
} }
actor->timer_0BC = actor->iwork[2]; actor->timer_0BC = actor->iwork[2];
Audio_PlaySfx(0x1903205B, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903205B, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state = 2; actor->state = 2;
case 2: case 2:
@ -670,7 +670,7 @@ void func_i1_80192CD4(Actor* actor) {
func_i1_80192AA4(actor); func_i1_80192AA4(actor);
actor->iwork[1] = 5; actor->iwork[1] = 5;
actor->obj.rot.x = 90.0f; actor->obj.rot.x = 90.0f;
Audio_PlaySfx(0x1903205C, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903205C, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
} }
break; break;
@ -723,7 +723,7 @@ void func_i1_80192EB0(Actor* actor) {
actor->fwork[1] = 1237.0f - (var_ft4 - actor->obj.pos.y); actor->fwork[1] = 1237.0f - (var_ft4 - actor->obj.pos.y);
actor->obj.pos.y = var_ft4 + 1.0f; actor->obj.pos.y = var_ft4 + 1.0f;
actor->timer_0BC = actor->iwork[1]; actor->timer_0BC = actor->iwork[1];
Audio_PlaySfx(0x1903205B, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903205B, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state = 2; actor->state = 2;
case 2: case 2:
@ -798,11 +798,11 @@ void func_i1_801933DC(Actor* actor) {
if (actor->unk_0D0 == 1) { if (actor->unk_0D0 == 1) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((actor->unk_0B6 == 38) || (actor->unk_0B6 == 58)) { if ((actor->unk_0B6 == 38) || (actor->unk_0B6 == 58)) {
Audio_PlaySfx(0x1903005A, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903005A, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Animation_GetFrameData(&D_900D098, actor->unk_0B6, actor->vwork); Animation_GetFrameData(&D_900D098, actor->unk_0B6, actor->vwork);
@ -1280,8 +1280,8 @@ void func_i1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = D_i1_8019A820[spF4].unk_0C; D_i1_8019B838[is4].unk_02[1] = D_i1_8019A820[spF4].unk_0C;
D_i1_8019B838[is4].unk_7C |= 4; D_i1_8019B838[is4].unk_7C |= 4;
Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
is4 = D_i1_8019A820[spF4].unk_0A; is4 = D_i1_8019A820[spF4].unk_0A;
if (is4 != -1) { if (is4 != -1) {
@ -1567,28 +1567,28 @@ void func_i1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[2] = 15; D_i1_8019B838[is4].unk_02[2] = 15;
if (D_i1_8019B838[is4].unk_00 <= 0) { if (D_i1_8019B838[is4].unk_00 <= 0) {
Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[is4].unk_00 = -1; D_i1_8019B838[is4].unk_00 = -1;
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = 0; D_i1_8019B838[is4].unk_02[1] = 0;
D_i1_8019B838[is4].unk_7C |= 0xC; D_i1_8019B838[is4].unk_7C |= 0xC;
} else { } else {
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (is4 == 14) { if (is4 == 14) {
D_i1_8019B838[is4].unk_7C |= 8; D_i1_8019B838[is4].unk_7C |= 8;
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 2: case 2:
if (D_i1_8019A500[boss->dmgPart] == 15) { if (D_i1_8019A500[boss->dmgPart] == 15) {
Audio_PlaySfx(0x31034064, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31034064, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[15].unk_02[2] = 10; D_i1_8019B838[15].unk_02[2] = 10;
D_i1_8019B838[15].unk_02[3] = 0; D_i1_8019B838[15].unk_02[3] = 0;
D_i1_8019B838[15].unk_7C |= 0x80; D_i1_8019B838[15].unk_7C |= 0x80;
@ -1600,12 +1600,12 @@ void func_i1_80194398(Boss* boss) {
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
D_8017796C = -1; D_8017796C = -1;
D_8017828C = 1; D_8017828C = 1;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->health = 0; boss->health = 0;
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -1623,8 +1623,8 @@ void func_i1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = 0; D_i1_8019B838[is4].unk_02[1] = 0;
D_i1_8019B838[is4].unk_7C |= 0xC; D_i1_8019B838[is4].unk_7C |= 0xC;
Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030059, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (is4 == 14) { } else if (is4 == 14) {
D_i1_8019B838[is4].unk_7C |= 8; D_i1_8019B838[is4].unk_7C |= 8;
} }
@ -1637,7 +1637,7 @@ void func_i1_80194398(Boss* boss) {
if (!(gGameFrameCount & 3) && (boss->timer_05A == 0)) { if (!(gGameFrameCount & 3) && (boss->timer_05A == 0)) {
for (spF4 = 0; spF4 < 33U; spF4++) { for (spF4 = 0; spF4 < 33U; spF4++) {
if ((D_i1_8019A500[spF4] == 15) && (D_i1_8019B7F0[spF4] != 0)) { if ((D_i1_8019A500[spF4] == 15) && (D_i1_8019B7F0[spF4] != 0)) {
Audio_PlaySfx(0x31034064, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31034064, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[15].unk_02[3] = 10; D_i1_8019B838[15].unk_02[3] = 10;
D_i1_8019B838[15].unk_02[4] = 0; D_i1_8019B838[15].unk_02[4] = 0;
D_i1_8019B838[15].unk_7C |= 0x80; D_i1_8019B838[15].unk_7C |= 0x80;
@ -1648,7 +1648,8 @@ void func_i1_80194398(Boss* boss) {
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
D_8017796C = -1; D_8017796C = -1;
D_8017828C = 1; D_8017828C = 1;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
boss->health = 0; boss->health = 0;
} }
} }
@ -1739,7 +1740,7 @@ void func_i1_80194398(Boss* boss) {
boss->swork[10] = 16; boss->swork[10] = 16;
D_80178480 = 40; D_80178480 = 40;
boss->swork[23] = RAND_FLOAT(5.0f); boss->swork[23] = RAND_FLOAT(5.0f);
Audio_PlaySfx(0x29034082, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034082, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
spB8 = 3; spB8 = 3;
boss->swork[28] = 5; boss->swork[28] = 5;
} }
@ -1805,13 +1806,13 @@ void func_i1_80194398(Boss* boss) {
switch (boss->swork[27]) { switch (boss->swork[27]) {
case 0: case 0:
if (boss->fwork[10] > 14.0f) { if (boss->fwork[10] > 14.0f) {
Audio_PlaySfx(0x29032080, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29032080, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[27]++; boss->swork[27]++;
} }
break; break;
case 1: case 1:
if (boss->fwork[10] > 45.0f) { if (boss->fwork[10] > 45.0f) {
Audio_PlaySfx(0x29032080, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29032080, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[27]++; boss->swork[27]++;
} }
break; break;
@ -1850,7 +1851,7 @@ void func_i1_80194398(Boss* boss) {
case 122: case 122:
D_80178480 = 20; D_80178480 = 20;
boss->swork[28] = 7; boss->swork[28] = 7;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[2].unk_60 = 5.0f; D_i1_8019B838[2].unk_60 = 5.0f;
D_i1_8019B838[2].unk_7C |= 0x800; D_i1_8019B838[2].unk_7C |= 0x800;
D_i1_8019B838[5].unk_7C |= 0x800; D_i1_8019B838[5].unk_7C |= 0x800;
@ -1866,7 +1867,7 @@ void func_i1_80194398(Boss* boss) {
case 118: case 118:
D_80178480 = 30; D_80178480 = 30;
boss->swork[28] = 7; boss->swork[28] = 7;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[8].unk_7C |= 0x800; D_i1_8019B838[8].unk_7C |= 0x800;
D_i1_8019B838[8].unk_60 = 10.0f; D_i1_8019B838[8].unk_60 = 10.0f;
break; break;
@ -1875,11 +1876,11 @@ void func_i1_80194398(Boss* boss) {
break; break;
case 91: case 91:
boss->swork[28] = 7; boss->swork[28] = 7;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 78: case 78:
boss->swork[28] = 7; boss->swork[28] = 7;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178480 = 20; D_80178480 = 20;
D_i1_8019B838[10].unk_7C |= 0x800; D_i1_8019B838[10].unk_7C |= 0x800;
D_i1_8019B838[10].unk_60 = 10.0f; D_i1_8019B838[10].unk_60 = 10.0f;
@ -1889,7 +1890,7 @@ void func_i1_80194398(Boss* boss) {
break; break;
case 66: case 66:
boss->swork[28] = 7; boss->swork[28] = 7;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i1_8019B838[11].unk_7C |= 0x20; D_i1_8019B838[11].unk_7C |= 0x20;
break; break;
case 65: case 65:
@ -1931,7 +1932,7 @@ void func_i1_80194398(Boss* boss) {
func_80042EC0(boss); func_80042EC0(boss);
gShowBossHealth = 0; gShowBossHealth = 0;
boss->swork[28] = 9; boss->swork[28] = 9;
Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29405084, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[26] = 1; boss->swork[26] = 1;
boss->info.hitbox = D_800CBF34; boss->info.hitbox = D_800CBF34;
boss->unk_05E = 0; boss->unk_05E = 0;
@ -1956,7 +1957,7 @@ void func_i1_80194398(Boss* boss) {
boss->swork[11] |= 1; boss->swork[11] |= 1;
break; break;
case 1: case 1:
Audio_PlaySfx(0x31030083, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31030083, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178480 = 40; D_80178480 = 40;
boss->swork[28] = 5; boss->swork[28] = 5;
spB8 = spB4 = 1; spB8 = spB4 = 1;
@ -1974,7 +1975,7 @@ void func_i1_80194398(Boss* boss) {
break; break;
case 1: case 1:
spB4 = 1; spB4 = 1;
Audio_PlaySfx(0x31030083, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31030083, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178480 = 40; D_80178480 = 40;
boss->swork[28] = 5; boss->swork[28] = 5;
spB8 = 2; spB8 = 2;
@ -2167,7 +2168,7 @@ void func_i1_80194398(Boss* boss) {
} }
break; break;
case 4: case 4:
Audio_PlaySfx(0x29033081, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033081, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[7] = 1; boss->swork[7] = 1;
boss->fwork[10] = 0; boss->fwork[10] = 0;
boss->gravity = 0; boss->gravity = 0;

60
src/overlays/ovl_i2/fox_me.c
View file

@ -260,7 +260,7 @@ void func_i2_80187E38(f32 x, f32 y, f32 z, f32 arg3) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
func_i2_80187D98(&gEffects[i], x, y, z, arg3, 0); func_i2_80187D98(&gEffects[i], x, y, z, arg3, 0);
Audio_PlaySfx(0x31037057U, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31037057U, gEffects[i].sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -308,7 +308,7 @@ void func_i2_80188088(Boss* boss) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
func_i2_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); func_i2_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f);
Audio_PlaySfx(0x19006035U, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19006035U, gEffects[i].sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -353,7 +353,7 @@ void func_i2_80188298(f32 x, f32 y, f32 z, f32 zRot) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
func_i2_801881A8(&gEffects[i], x, y, z, zRot, -1); func_i2_801881A8(&gEffects[i], x, y, z, zRot, -1);
Audio_PlaySfx(0x3102705CU, gEffects[i].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102705CU, gEffects[i].sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -450,7 +450,7 @@ void func_i2_80188344(Boss* boss) {
boss->info.unk_10 = 1000.0f; boss->info.unk_10 = 1000.0f;
func_8001A55C(boss->sfxPos, 0x3103605B); func_8001A55C(boss->sfxPos, 0x3103605B);
Audio_PlaySfx(0x3102405DU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102405DU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -534,7 +534,7 @@ void func_i2_80188A40(Boss* boss) {
Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id);
Radio_PlayMessage(gMsg_ID_3300, RCID_BOSS_METEO); Radio_PlayMessage(gMsg_ID_3300, RCID_BOSS_METEO);
Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) { void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) {
@ -862,13 +862,13 @@ void func_i2_8018978C(Boss* boss) {
if (boss->dmgType != 0) { if (boss->dmgType != 0) {
boss->dmgType = 0; boss->dmgType = 0;
if ((boss->dmgPart != 7) && (boss->dmgPart >= 5) && (boss->dmgPart != 5)) { if ((boss->dmgPart != 7) && (boss->dmgPart >= 5) && (boss->dmgPart != 5)) {
Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((boss->state >= 2) && (boss->state < 20)) { if ((boss->state >= 2) && (boss->state < 20)) {
if ((boss->dmgPart < 5) && (boss[0].fwork[17 + boss->dmgPart] > 0.5f)) { if ((boss->dmgPart < 5) && (boss[0].fwork[17 + boss->dmgPart] > 0.5f)) {
if (boss[0].swork[boss->dmgPart + 2] != 0) { if (boss[0].swork[boss->dmgPart + 2] != 0) {
Audio_PlaySfx(0x29034003U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss[0].swork[9 + boss->dmgPart] = 20; boss[0].swork[9 + boss->dmgPart] = 20;
boss[0].swork[2 + boss->dmgPart] -= boss->damage; boss[0].swork[2 + boss->dmgPart] -= boss->damage;
@ -888,14 +888,14 @@ void func_i2_8018978C(Boss* boss) {
} }
} }
} else { } else {
Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (boss->state >= 9) { if (boss->state >= 9) {
if (boss->dmgPart == 5) { if (boss->dmgPart == 5) {
if ((boss->swork[7] != 0) && (boss->fwork[22] > 0.8f)) { if ((boss->swork[7] != 0) && (boss->fwork[22] > 0.8f)) {
Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[14] = 20; boss->swork[14] = 20;
boss->swork[7] -= boss->damage; boss->swork[7] -= boss->damage;
if (boss->swork[7] <= 0) { if (boss->swork[7] <= 0) {
@ -903,13 +903,13 @@ void func_i2_8018978C(Boss* boss) {
func_i2_801892F0(boss, boss->dmgPart); func_i2_801892F0(boss, boss->dmgPart);
} }
} else { } else {
Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (boss->dmgPart == 7) { if (boss->dmgPart == 7) {
if ((boss->swork[8] != 0) && (boss->fwork[23] > 0.8f)) { if ((boss->swork[8] != 0) && (boss->fwork[23] > 0.8f)) {
Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[15] = 20; boss->swork[15] = 20;
boss->swork[8] -= boss->damage; boss->swork[8] -= boss->damage;
if (boss->swork[8] <= 0) { if (boss->swork[8] <= 0) {
@ -917,7 +917,7 @@ void func_i2_8018978C(Boss* boss) {
func_i2_801892F0(boss, boss->dmgPart); func_i2_801892F0(boss, boss->dmgPart);
} }
} else { } else {
Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -940,7 +940,7 @@ void func_i2_8018978C(Boss* boss) {
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
} }
} }
@ -1044,7 +1044,7 @@ void func_i2_8018978C(Boss* boss) {
id = 190; id = 190;
} }
Audio_PlaySfx(0x2903201BU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903201BU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
src.x = 0.0f; src.x = 0.0f;
src.y = 330.0f; src.y = 330.0f;
@ -1147,7 +1147,7 @@ void func_i2_8018978C(Boss* boss) {
boss->timer_052 = 80; boss->timer_052 = 80;
} else if (boss->vel.z < -50.0f) { } else if (boss->vel.z < -50.0f) {
if (boss->swork[0] == 5) { if (boss->swork[0] == 5) {
Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->swork[0] < 10) { if (boss->swork[0] < 10) {
@ -1194,7 +1194,7 @@ void func_i2_8018978C(Boss* boss) {
if ((boss->timer_050 == 0) && (gBosses[boss->unk_044].state == 2)) { if ((boss->timer_050 == 0) && (gBosses[boss->unk_044].state == 2)) {
boss->fwork[2] = 90.0f; boss->fwork[2] = 90.0f;
boss->timer_050 = D_i2_80195520[var_v0] + 45; boss->timer_050 = D_i2_80195520[var_v0] + 45;
Audio_PlaySfx(0x19030036U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030036U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->fwork[2] > 0.0f) { if (boss->fwork[2] > 0.0f) {
@ -1228,7 +1228,7 @@ void func_i2_8018978C(Boss* boss) {
boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * 0.02f); boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * 0.02f);
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
Audio_PlaySfx(0x31016056U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31016056U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
@ -1279,7 +1279,7 @@ void func_i2_8018978C(Boss* boss) {
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->state = 7; boss->state = 7;
Audio_PlaySfx(0x29038058U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29038058U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_i2_80189624(); func_i2_80189624();
} }
@ -1344,7 +1344,7 @@ void func_i2_8018978C(Boss* boss) {
if (boss->timer_052 != 0) { if (boss->timer_052 != 0) {
if (boss->swork[0] == 5) { if (boss->swork[0] == 5) {
Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->swork[0] < 10) { if (boss->swork[0] < 10) {
boss->swork[0] += 2; boss->swork[0] += 2;
@ -1358,7 +1358,7 @@ void func_i2_8018978C(Boss* boss) {
boss->state = 9; boss->state = 9;
boss->timer_050 = 0; boss->timer_050 = 0;
boss->fwork[15] = 8.0f; boss->fwork[15] = 8.0f;
Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1405,7 +1405,7 @@ void func_i2_8018978C(Boss* boss) {
boss->state = 9; boss->state = 9;
boss->timer_050 = 70; boss->timer_050 = 70;
boss->fwork[15] = 8.0f; boss->fwork[15] = 8.0f;
Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11015034U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if ((boss->timer_050 & 1) == 1) { } else if ((boss->timer_050 & 1) == 1) {
func_i2_80188088(boss); func_i2_80188088(boss);
} }
@ -1444,7 +1444,7 @@ void func_i2_8018978C(Boss* boss) {
} }
if (boss->timer_050 == 20) { if (boss->timer_050 == 20) {
func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f); func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f);
Audio_PlaySfx(0x2940F026U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80177BD0[0] = 60; D_Timer_80177BD0[0] = 60;
for (i = 0; i < ARRAY_COUNT(gActors); i++) { for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if (gActors[i].obj.id == 0xC6) { if (gActors[i].obj.id == 0xC6) {
@ -1789,12 +1789,12 @@ void func_i2_8018C77C(Actor* actor, s32 arg1) {
if (actor->unk_0B6 == 0) { if (actor->unk_0B6 == 0) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i2_8018C8F4(Actor* actor1, Actor* actor2) { void func_i2_8018C8F4(Actor* actor1, Actor* actor2) {
@ -2197,12 +2197,12 @@ void func_i2_8018DF08(Actor* actor, s32 idx) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (idx == 3) { if (idx == 3) {
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} else { } else {
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -2431,7 +2431,7 @@ void func_i2_8018E084(Player* player) {
break; break;
case 1390: case 1390:
Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
break; break;
@ -2494,7 +2494,7 @@ void func_i2_8018ED9C(Actor* actor) {
case 1: case 1:
actor->state = 2; actor->state = 2;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0BC = 0x96; actor->timer_0BC = 0x96;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;

46
src/overlays/ovl_i2/fox_sx.c
View file

@ -418,7 +418,7 @@ void func_i2_80190078(Boss* boss) {
boss->dmgType = 0; boss->dmgType = 0;
if (boss->swork[0] == 1) { if (boss->swork[0] == 1) {
if ((boss->dmgPart == 0) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) { if ((boss->dmgPart == 0) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) {
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[3] -= boss->damage; boss->swork[3] -= boss->damage;
boss->timer_054 = 20; boss->timer_054 = 20;
func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x,
@ -464,7 +464,7 @@ void func_i2_80190078(Boss* boss) {
if (boss->dmgPart == 0) { if (boss->dmgPart == 0) {
boss->health -= boss->damage; boss->health -= boss->damage;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->health <= 0) { if (boss->health <= 0) {
D_8017796C = -1; D_8017796C = -1;
@ -488,7 +488,7 @@ void func_i2_80190078(Boss* boss) {
boss->swork[4] = 2; boss->swork[4] = 2;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
@ -542,7 +542,7 @@ void func_i2_80190078(Boss* boss) {
case 90: case 90:
if ((boss->timer_050 == 110) || (boss->timer_050 == 66)) { if ((boss->timer_050 == 110) || (boss->timer_050 == 66)) {
Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) { if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) {
@ -564,7 +564,7 @@ void func_i2_80190078(Boss* boss) {
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->state = 100; boss->state = 100;
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
Audio_PlaySfx(0x29400023, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29400023, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
boss->fwork[43] = boss->fwork[44] = 5.0f; boss->fwork[43] = boss->fwork[44] = 5.0f;
boss->fwork[42] = 30.0f; boss->fwork[42] = 30.0f;
@ -583,7 +583,7 @@ void func_i2_80190078(Boss* boss) {
boss->unk_04C = 0; boss->unk_04C = 0;
boss->state = 1; boss->state = 1;
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
Audio_PlaySfx(0x29402024, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29402024, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
boss->fwork[43] = boss->fwork[44] = 5.0f; boss->fwork[43] = boss->fwork[44] = 5.0f;
@ -630,7 +630,7 @@ void func_i2_80190078(Boss* boss) {
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
} }
@ -666,7 +666,7 @@ void func_i2_80190078(Boss* boss) {
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
} }
@ -724,14 +724,14 @@ void func_i2_80190078(Boss* boss) {
sp74.z = boss->fwork[10] + boss->obj.pos.z; sp74.z = boss->fwork[10] + boss->obj.pos.z;
func_8005F0E8(D_i2_80195D88, &sp74); func_8005F0E8(D_i2_80195D88, &sp74);
Audio_PlaySfx(0x31032061, D_i2_80195D88, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31032061, D_i2_80195D88, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
sp74.x = boss->fwork[11] + boss->obj.pos.x; sp74.x = boss->fwork[11] + boss->obj.pos.x;
sp74.y = boss->fwork[12] + boss->obj.pos.y; sp74.y = boss->fwork[12] + boss->obj.pos.y;
sp74.z = boss->fwork[13] + boss->obj.pos.z; sp74.z = boss->fwork[13] + boss->obj.pos.z;
func_8005F0E8(D_i2_80195D98, &sp74); func_8005F0E8(D_i2_80195D98, &sp74);
Audio_PlaySfx(0x31032061, D_i2_80195D98, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31032061, D_i2_80195D98, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0);
Math_SmoothStepToF(&boss->fwork[28], -30.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[28], -30.0f, 0.05f, 1.0f, 0);
@ -806,7 +806,7 @@ void func_i2_80190078(Boss* boss) {
case 6: // Arms come back to robot case 6: // Arms come back to robot
if ((boss->timer_050 == 20) || (boss->timer_050 == 30)) { if ((boss->timer_050 == 20) || (boss->timer_050 == 30)) {
Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433022, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
@ -914,7 +914,7 @@ void func_i2_80190078(Boss* boss) {
} }
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (boss->timer_050 == 1) { } else if (boss->timer_050 == 1) {
Radio_PlayMessage(gMsg_ID_20267, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_20267, RCID_PEPPY);
@ -949,7 +949,7 @@ void func_i2_80190078(Boss* boss) {
if (boss->unk_04C == 70) { if (boss->unk_04C == 70) {
func_i2_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y, func_i2_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y,
boss->fwork[13] + boss->obj.pos.z); boss->fwork[13] + boss->obj.pos.z);
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -965,7 +965,7 @@ void func_i2_80190078(Boss* boss) {
boss->unk_04C++; boss->unk_04C++;
if (!(boss->unk_04C & 15)) { if (!(boss->unk_04C & 15)) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->unk_04C >= Animation_GetFrameCount(&D_60158C4)) { if (boss->unk_04C >= Animation_GetFrameCount(&D_60158C4)) {
@ -1004,13 +1004,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[3] = -1000.0f; boss->fwork[3] = -1000.0f;
boss->fwork[1] = -2500.0f; boss->fwork[1] = -2500.0f;
if (!(gGameFrameCount & 15)) { if (!(gGameFrameCount & 15)) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (boss->timer_050 > 100) { } else if (boss->timer_050 > 100) {
boss->fwork[3] = 0; boss->fwork[3] = 0;
boss->fwork[1] = -500.0f; boss->fwork[1] = -500.0f;
if (!(gGameFrameCount & 0xF)) { if (!(gGameFrameCount & 0xF)) {
Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
boss->fwork[3] = 0; boss->fwork[3] = 0;
@ -1443,7 +1443,7 @@ void func_i2_80193800(Actor* actor, s32 arg1) {
actor->obj.rot.x = 15.0f; actor->obj.rot.x = 15.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i2_801938D8(Actor* actor, s32 arg1) { void func_i2_801938D8(Actor* actor, s32 arg1) {
@ -1463,8 +1463,8 @@ void func_i2_801938D8(Actor* actor, s32 arg1) {
actor->obj.rot.z = -20.0f; actor->obj.rot.z = -20.0f;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i2_80193A30(Player* player) { void func_i2_80193A30(Player* player) {
@ -1543,7 +1543,7 @@ void func_i2_80193A30(Player* player) {
player->unk_0D0 = 30.0f; player->unk_0D0 = 30.0f;
player->unk_0EC = -80.0f; player->unk_0EC = -80.0f;
player->unk_0E4 = -20.0f; player->unk_0E4 = -20.0f;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 6; i < 10; i++) { for (i = 6; i < 10; i++) {
Object_Kill(&gActors[i].obj, gActors[i].sfxPos); Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
} }
@ -1690,7 +1690,7 @@ void func_i2_801944D4(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_i2_80195770[arg1]; actor->obj.rot.z = D_i2_80195770[arg1];
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->iwork[14] = D_i2_8019577C[arg1]; actor->iwork[14] = D_i2_8019577C[arg1];
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1819,7 +1819,7 @@ void func_i2_80194728(Player* player) {
case 920: case 920:
gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0; gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0;
func_i2_801944D4(&gActors[0], 3); func_i2_801944D4(&gActors[0], 3);
Audio_PlaySfx(0x11030010, gActors[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, gActors[0].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1050: case 1050:
@ -1837,7 +1837,7 @@ void func_i2_80194728(Player* player) {
case 1160: case 1160:
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_1D0 = 2; player->unk_1D0 = 2;
player->timer_1F8 = 40; player->timer_1F8 = 40;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;

72
src/overlays/ovl_i3/fox_a6.c
View file

@ -525,7 +525,7 @@ void func_i3_80187754(Boss* bossA6) {
A6_HIT_1(bossA6, 0)->x.size = A6_HIT_1(bossA6, 1)->x.size = A6_HIT_1(bossA6, 2)->x.size = 153.0f; A6_HIT_1(bossA6, 0)->x.size = A6_HIT_1(bossA6, 1)->x.size = A6_HIT_1(bossA6, 2)->x.size = 153.0f;
func_800182F4(0x102800FF); func_800182F4(0x102800FF);
func_800182F4(0x112800FF); func_800182F4(0x112800FF);
Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
#ifdef NON_MATCHING #ifdef NON_MATCHING
@ -570,9 +570,9 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->health -= bossA6->damage; bossA6->health -= bossA6->damage;
if (bossA6->health < 390) { if (bossA6->health < 390) {
Audio_PlaySfx(0x2943500F, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossA6->health <= 0) { if (bossA6->health <= 0) {
bossA6->health = 0; bossA6->health = 0;
@ -580,7 +580,7 @@ void func_i3_80187944(Boss* bossA6) {
Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY);
D_8017796C = -1; D_8017796C = -1;
D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f; D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f;
Audio_PlaySfx(0x2940D09A, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gShowBossHealth = 0; gShowBossHealth = 0;
func_800182F4(0x102800FF); func_800182F4(0x102800FF);
func_800182F4(0x112800FF); func_800182F4(0x112800FF);
@ -601,8 +601,8 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0; bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0;
D_Timer_80161A60 = 4; D_Timer_80161A60 = 4;
bossA6->state = 11; bossA6->state = 11;
Audio_PlaySfx(0x2940C00A, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x3143402E, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3143402E, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (((bossA6->dmgPart == 4) || (bossA6->dmgPart == 5) || (bossA6->dmgPart == 6)) && if (((bossA6->dmgPart == 4) || (bossA6->dmgPart == 5) || (bossA6->dmgPart == 6)) &&
@ -614,7 +614,7 @@ void func_i3_80187944(Boss* bossA6) {
func_i3_8018A2C4(bossA6); func_i3_8018A2C4(bossA6);
} }
if (bossA6->dmgPart >= 7) { if (bossA6->dmgPart >= 7) {
Audio_PlaySfx(0x29121007, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -778,7 +778,7 @@ void func_i3_80187944(Boss* bossA6) {
if (D_i3_801C22F0.unk_24 < 1.0f) { if (D_i3_801C22F0.unk_24 < 1.0f) {
D_i3_801C22F0.unk_24 = 0.0f; D_i3_801C22F0.unk_24 = 0.0f;
Audio_KillSfx(bossA6->sfxPos); Audio_KillSfx(bossA6->sfxPos);
Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossA6->timer_050 = 20; bossA6->timer_050 = 20;
bossA6->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3]; bossA6->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3];
bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].camEye.x; bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].camEye.x;
@ -788,7 +788,7 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->vel.y = 0.0f; bossA6->vel.y = 0.0f;
bossA6->vel.z = -40.0f; bossA6->vel.z = -40.0f;
Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -798,7 +798,7 @@ void func_i3_80187944(Boss* bossA6) {
Math_SmoothStepToAngle(&bossA6->obj.rot.z, 0.0f, 1.0f, 10.0f, 0.0001f); Math_SmoothStepToAngle(&bossA6->obj.rot.z, 0.0f, 1.0f, 10.0f, 0.0001f);
if (bossA6->obj.rot.z < 1.0f) { if (bossA6->obj.rot.z < 1.0f) {
if (D_i3_801C2250[A6_BSS_27] == 0) { if (D_i3_801C2250[A6_BSS_27] == 0) {
Audio_PlaySfx(0x39408091, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39408091, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C2250[A6_BSS_27] = 1; D_i3_801C2250[A6_BSS_27] = 1;
} }
bossA6->obj.rot.z = 0.0f; bossA6->obj.rot.z = 0.0f;
@ -831,7 +831,7 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->timer_050 = 50; bossA6->timer_050 = 50;
bossA6->state = 2; bossA6->state = 2;
D_i3_801C2250[A6_BSS_8] = 0; D_i3_801C2250[A6_BSS_8] = 0;
Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39408092, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -886,7 +886,7 @@ void func_i3_80187944(Boss* bossA6) {
if ((D_i3_801C2250[A6_BSS_6] == 0) || (D_i3_801C2250[A6_BSS_0] == 0)) { if ((D_i3_801C2250[A6_BSS_6] == 0) || (D_i3_801C2250[A6_BSS_0] == 0)) {
bossA6->fwork[A6_FWK_1] = 90.0f; bossA6->fwork[A6_FWK_1] = 90.0f;
bossA6->fwork[A6_FWK_2] = 2.0f; bossA6->fwork[A6_FWK_2] = 2.0f;
Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
D_i3_801C2250[A6_BSS_7] = 0; D_i3_801C2250[A6_BSS_7] = 0;
} }
@ -897,7 +897,7 @@ void func_i3_80187944(Boss* bossA6) {
if (bossA6->timer_050 == 1) { if (bossA6->timer_050 == 1) {
Audio_KillSfx(bossA6->sfxPos); Audio_KillSfx(bossA6->sfxPos);
if (D_i3_801C2250[A6_BSS_7] == 0) { if (D_i3_801C2250[A6_BSS_7] == 0) {
Audio_PlaySfx(0x31008069, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31008069, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C2250[A6_BSS_7] = 1; D_i3_801C2250[A6_BSS_7] = 1;
} }
} }
@ -929,7 +929,7 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028454); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028454);
D_i3_801C2250[A6_BSS_6] = 1; D_i3_801C2250[A6_BSS_6] = 1;
Audio_KillSfx(bossA6->sfxPos); Audio_KillSfx(bossA6->sfxPos);
Audio_PlaySfx(0x31404067, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31404067, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0; bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0;
} else if (bossA6->swork[A6_SWK_30 + 0] == 0) { } else if (bossA6->swork[A6_SWK_30 + 0] == 0) {
func_i3_8018A1B0(bossA6, 0); func_i3_8018A1B0(bossA6, 0);
@ -948,7 +948,7 @@ void func_i3_80187944(Boss* bossA6) {
} }
bossA6->fwork[A6_FWK_3] = RAND_FLOAT_CENTERED(1000.0f) + -3700.0f; bossA6->fwork[A6_FWK_3] = RAND_FLOAT_CENTERED(1000.0f) + -3700.0f;
if (D_i3_801C2250[A6_BSS_28] == 0) { if (D_i3_801C2250[A6_BSS_28] == 0) {
Audio_PlaySfx(0x39404068, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39404068, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
Math_SmoothStepToF(&bossA6->fwork[A6_FWK_29], 255.0f, 1.0f, 10.0f, 0.0001f); Math_SmoothStepToF(&bossA6->fwork[A6_FWK_29], 255.0f, 1.0f, 10.0f, 0.0001f);
@ -976,7 +976,7 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->timer_050 = 30; bossA6->timer_050 = 30;
bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0; bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0;
bossA6->fwork[A6_FWK_2] = 2.0f; bossA6->fwork[A6_FWK_2] = 2.0f;
Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31404066, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
D_i3_801C2250[A6_BSS_7] = bossA6->swork[A6_SWK_37] = 0; D_i3_801C2250[A6_BSS_7] = bossA6->swork[A6_SWK_37] = 0;
bossA6->state = 3; bossA6->state = 3;
@ -998,7 +998,7 @@ void func_i3_80187944(Boss* bossA6) {
case 5: case 5:
if (bossA6->timer_050 == 1) { if (bossA6->timer_050 == 1) {
func_i3_80187704(); func_i3_80187704();
Audio_PlaySfx(0x39033093, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033093, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C2250[A6_BSS_33] = 120; D_i3_801C2250[A6_BSS_33] = 120;
} }
if (D_i3_801C2250[A6_BSS_33] != 0) { if (D_i3_801C2250[A6_BSS_33] != 0) {
@ -1066,13 +1066,13 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->timer_052 = 300; bossA6->timer_052 = 300;
bossA6->timer_054 = 0; bossA6->timer_054 = 0;
bossA6->state = 9; bossA6->state = 9;
Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11002050, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 9: case 9:
if (bossA6->timer_052 == 0) { if (bossA6->timer_052 == 0) {
Audio_KillSfx(bossA6->sfxPos); Audio_KillSfx(bossA6->sfxPos);
Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19004051, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossA6->timer_054 = 0; bossA6->timer_054 = 0;
bossA6->state = 10; bossA6->state = 10;
} else { } else {
@ -1633,7 +1633,7 @@ void func_i3_8018B9BC(Boss* bossA6) {
D_i3_801C2250[A6_BSS_25] = 20; D_i3_801C2250[A6_BSS_25] = 20;
} }
} }
Audio_PlaySfx(0x29033064, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033064, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (bossA6->swork[A6_SWK_0 + j] <= 0) { if (bossA6->swork[A6_SWK_0 + j] <= 0) {
bossA6->swork[A6_SWK_0 + j] = 0; bossA6->swork[A6_SWK_0 + j] = 0;
Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94); Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94);
@ -1902,7 +1902,7 @@ void func_i3_8018C54C(Boss* bossA6) {
if (bossA6->swork[A6_SWK_25] != 0) { if (bossA6->swork[A6_SWK_25] != 0) {
j = bossA6->swork[A6_SWK_25] - 1; j = bossA6->swork[A6_SWK_25] - 1;
if ((bossA6->timer_058 != 0) && !(bossA6->timer_058 & 3)) { if ((bossA6->timer_058 != 0) && !(bossA6->timer_058 & 3)) {
Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, bossA6->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossA6->timer_058 == 1) { if (bossA6->timer_058 == 1) {
if (bossA6->swork[A6_SWK_25] == 2) { if (bossA6->swork[A6_SWK_25] == 2) {
@ -1996,7 +1996,7 @@ void func_i3_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel
gPlayerShots[i].unk_64 = 150; gPlayerShots[i].unk_64 = 150;
gPlayerShots[i].playerNum = 100; gPlayerShots[i].playerNum = 100;
Audio_PlaySfx(0x2900000D, gPlayerShots[i].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900000D, gPlayerShots[i].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -2028,7 +2028,7 @@ void func_i3_8018D5C8(void) {
gActors[i].fwork[0] = 0.0f; gActors[i].fwork[0] = 0.0f;
gActors[i].obj.id = OBJ_ACTOR_195; gActors[i].obj.id = OBJ_ACTOR_195;
Object_SetInfo(&gActors[i].info, gActors[i].obj.id); Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
Audio_PlaySfx(0x11030010, gActors[i].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, gActors[i].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8018D694(Actor* actor, s32 arg1) { void func_i3_8018D694(Actor* actor, s32 arg1) {
@ -2052,7 +2052,7 @@ void func_i3_8018D694(Actor* actor, s32 arg1) {
actor->fwork[8] = RAND_FLOAT_SEEDED(360.0f); actor->fwork[8] = RAND_FLOAT_SEEDED(360.0f);
actor->fwork[9] = RAND_FLOAT_SEEDED(360.0f); actor->fwork[9] = RAND_FLOAT_SEEDED(360.0f);
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8018D804(Actor* actor, s32 arg1) { void func_i3_8018D804(Actor* actor, s32 arg1) {
@ -2073,7 +2073,7 @@ void func_i3_8018D804(Actor* actor, s32 arg1) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->fwork[0] = 0.0f; actor->fwork[0] = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8018D920(Vec3f* arg0) { void func_i3_8018D920(Vec3f* arg0) {
@ -2126,7 +2126,7 @@ void func_i3_8018DA58(Actor* actor) {
case 11: case 11:
case 16: case 16:
actor->state++; actor->state++;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 7: case 7:
@ -2274,7 +2274,7 @@ void func_i3_8018DF74(Player* player) {
if (gCsFrameCount == 460) { if (gCsFrameCount == 460) {
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (gCsFrameCount >= 460) { if (gCsFrameCount >= 460) {
Math_SmoothStepToF(&player->unk_0D0, 50.0f, 0.1f, 3.0f, 0.01f); Math_SmoothStepToF(&player->unk_0D0, 50.0f, 0.1f, 3.0f, 0.01f);
@ -2418,8 +2418,8 @@ void func_i3_8018EB3C(Actor* actor) {
actor->state = 100; actor->state = 100;
actor->fwork[0] = 0.0f; actor->fwork[0] = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8018EC38(Actor* actor, s32 arg1) { void func_i3_8018EC38(Actor* actor, s32 arg1) {
@ -2444,7 +2444,7 @@ void func_i3_8018EC38(Actor* actor, s32 arg1) {
actor->iwork[14] = arg1 + 2; actor->iwork[14] = arg1 + 2;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -2467,7 +2467,7 @@ void func_i3_8018ED78(Player* player) {
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_0D0 = 60.0f; player->unk_0D0 = 60.0f;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177A48[3] = 0.0f; D_80177A48[3] = 0.0f;
/* fallthrough */ /* fallthrough */
case 1: case 1:
@ -2529,7 +2529,7 @@ void func_i3_8018ED78(Player* player) {
D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0;
} }
if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) { if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) {
Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (gCsFrameCount > 146) { if (gCsFrameCount > 146) {
actor4->iwork[3] -= 4; actor4->iwork[3] -= 4;
@ -2633,7 +2633,7 @@ void func_i3_8018ED78(Player* player) {
Object_Kill(&gActors[0].obj, gActors[0].sfxPos); Object_Kill(&gActors[0].obj, gActors[0].sfxPos);
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (gCsFrameCount >= 1090) { if (gCsFrameCount >= 1090) {
D_80178348 = D_80178350 = D_80178354 = 0; D_80178348 = D_80178350 = D_80178354 = 0;
@ -2684,15 +2684,15 @@ void func_i3_8018ED78(Player* player) {
break; break;
case 1070: case 1070:
gActors[1].fwork[29] = 5.0f; gActors[1].fwork[29] = 5.0f;
Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[1].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1072: case 1072:
gActors[2].fwork[29] = 5.0f; gActors[2].fwork[29] = 5.0f;
Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[2].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1074: case 1074:
gActors[3].fwork[29] = 5.0f; gActors[3].fwork[29] = 5.0f;
Audio_PlaySfx(0x09000002, gActors[3].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, gActors[3].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
if (gCsFrameCount >= 1070) { if (gCsFrameCount >= 1070) {

112
src/overlays/ovl_i3/fox_aq.c
View file

@ -664,7 +664,7 @@ void func_i3_801A9ED0(Player* player) {
} }
} }
if ((sp8C != D_i3_801C4190[4]) && (D_i3_801C41B8[5] == 3.0f)) { if ((sp8C != D_i3_801C4190[4]) && (D_i3_801C41B8[5] == 3.0f)) {
Audio_PlaySfx(0x4900001B, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900001B, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C41B8[5] = 20.0f; D_i3_801C41B8[5] = 20.0f;
} }
} }
@ -927,7 +927,7 @@ void func_i3_801AACF8(Player* player) {
sp58 = 0.0f; sp58 = 0.0f;
D_80177968 = 2.0f; D_80177968 = 2.0f;
if (D_i3_801C4190[7] == 0) { if (D_i3_801C4190[7] == 0) {
Audio_PlaySfx(0x9404028, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x9404028, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C4190[7] = 1; D_i3_801C4190[7] = 1;
} }
} }
@ -1147,7 +1147,7 @@ void func_i3_801AC09C(Player* player) {
for (i = 15, shot = &gPlayerShots[15]; i < 16; i++, shot++) { for (i = 15, shot = &gPlayerShots[15]; i < 16; i++, shot++) {
if (shot->obj.status == OBJ_FREE) { if (shot->obj.status == OBJ_FREE) {
func_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f); func_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f);
Audio_PlaySfx(0x1000025, shot->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1000025, shot->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C4190[5] = i + 1; D_i3_801C4190[5] = i + 1;
D_i3_801C4454 = 300; D_i3_801C4454 = 300;
D_i3_801C4458 = -100.0f; D_i3_801C4458 = -100.0f;
@ -1165,9 +1165,9 @@ void func_i3_801AC18C(Player* player) {
if (gPlayerShots[i].obj.status == OBJ_FREE) { if (gPlayerShots[i].obj.status == OBJ_FREE) {
func_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f); func_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f);
if (gLaserStrength[gPlayerNum] == LASERS_SINGLE) { if (gLaserStrength[gPlayerNum] == LASERS_SINGLE) {
Audio_PlaySfx(0x9400021, gPlayerShots[i].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x9400021, gPlayerShots[i].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x9400027, gPlayerShots[i].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x9400027, gPlayerShots[i].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -1232,7 +1232,7 @@ void func_i3_801AC274(Player* player) {
} }
if ((D_i3_801C4190[0] != temp) && (D_i3_801C41B8[5] == 3.0f)) { if ((D_i3_801C4190[0] != temp) && (D_i3_801C41B8[5] == 3.0f)) {
Audio_PlaySfx(0x4900001B, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900001B, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i3_801C41B8[5] = 20.0f; D_i3_801C41B8[5] = 20.0f;
} }
if (D_i3_801C4190[0] != 0) { if (D_i3_801C4190[0] != 0) {
@ -1427,7 +1427,7 @@ void func_i3_801ACE50(Player* player) {
if ((gBoostButton[player->num] & gInputHold->button) && (player->unk_230 == 0) && if ((gBoostButton[player->num] & gInputHold->button) && (player->unk_230 == 0) &&
(player->state_1C8 != PLAYERSTATE_1C8_5) && (player->unk_2B4 == 0)) { (player->state_1C8 != PLAYERSTATE_1C8_5) && (player->unk_2B4 == 0)) {
if (player->unk_2BC == 0) { if (player->unk_2BC == 0) {
Audio_PlaySfx(0x9004030, player->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x9004030, player->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_2BC += 3.0f; player->unk_2BC += 3.0f;
if (player->unk_2BC > 90.0f) { if (player->unk_2BC > 90.0f) {
@ -1467,7 +1467,7 @@ void func_i3_801AD328(Player* player) {
if ((gBrakeButton[player->num] & gInputHold->button) && (player->unk_230 == 0) && if ((gBrakeButton[player->num] & gInputHold->button) && (player->unk_230 == 0) &&
(player->state_1C8 != PLAYERSTATE_1C8_5) && (player->unk_2B4 == 0)) { (player->state_1C8 != PLAYERSTATE_1C8_5) && (player->unk_2B4 == 0)) {
if (player->unk_2BC == 0) { if (player->unk_2BC == 0) {
Audio_PlaySfx(0x9004031, player->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x9004031, player->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
player->unk_2BC += 3.0f; player->unk_2BC += 3.0f;
if (player->unk_2BC > 90.0f) { if (player->unk_2BC > 90.0f) {
@ -1562,7 +1562,7 @@ void func_i3_801AD6C0(Actor* actor) {
actor->unk_0F4.z = Math_ModF(actor->unk_0F4.z, 360.0f); actor->unk_0F4.z = Math_ModF(actor->unk_0F4.z, 360.0f);
} else { } else {
actor->health = 30; actor->health = 30;
Audio_PlaySfx(0x31000047, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000047, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
} }
break; break;
@ -1572,14 +1572,14 @@ void func_i3_801AD6C0(Actor* actor) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x29034045, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034045, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->timer_0C2 = 30000; actor->timer_0C2 = 30000;
actor->state = 2; actor->state = 2;
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
actor->vel.x = 0.0f; actor->vel.x = 0.0f;
actor->vel.z = 0.0f; actor->vel.z = 0.0f;
Audio_PlaySfx(0x2902A046, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902A046, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1658,7 +1658,7 @@ void func_i3_801AD6C0(Actor* actor) {
} }
actor->timer_0BC = 4; actor->timer_0BC = 4;
func_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f); func_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f);
Audio_PlaySfx(0x29018049, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29018049, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -1781,7 +1781,7 @@ void func_i3_801AE3D8(Actor* actor) {
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
actor->iwork[1] = 0; actor->iwork[1] = 0;
D_i3_801C4308[79] -= 5.0f; D_i3_801C4308[79] -= 5.0f;
Audio_PlaySfx(0x29036050, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29036050, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_i3_801C4308[79] <= -28.0f) { if (D_i3_801C4308[79] <= -28.0f) {
D_i3_801C4308[79] = -28.0f; D_i3_801C4308[79] = -28.0f;
} }
@ -1814,7 +1814,8 @@ void func_i3_801AE3D8(Actor* actor) {
actor->health = 0; actor->health = 0;
actor->timer_0C6 = 300; actor->timer_0C6 = 300;
actor->fwork[2] = actor->scale; actor->fwork[2] = actor->scale;
Audio_PlaySfx(0x19000033, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000033, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
actor->state++; actor->state++;
} }
} }
@ -2032,7 +2033,7 @@ void func_i3_801AFA5C(Actor* actor) {
if ((gBosses[0].state >= 10) && (actor->health != 0) && (actor->damage == 31)) { if ((gBosses[0].state >= 10) && (actor->health != 0) && (actor->damage == 31)) {
actor->timer_0BE = 70; actor->timer_0BE = 70;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903604CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903604CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->timer_0C6 == 0) { if (actor->timer_0C6 == 0) {
actor->timer_0C6 = 70; actor->timer_0C6 = 70;
} }
@ -2100,7 +2101,7 @@ void func_i3_801AFA5C(Actor* actor) {
i = -1; i = -1;
} }
if ((actor->iwork[1] == 13) && (i < 0)) { if ((actor->iwork[1] == 13) && (i < 0)) {
Audio_PlaySfx(0x29022048U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022048U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 0, sp48 = gActors; i < 60; i++, sp48++) { for (i = 0, sp48 = gActors; i < 60; i++, sp48++) {
if (sp48->obj.status == OBJ_FREE) { if (sp48->obj.status == OBJ_FREE) {
Actor_Initialize(sp48); Actor_Initialize(sp48);
@ -2151,7 +2152,7 @@ void func_i3_801AFA5C(Actor* actor) {
actor->state = 5; actor->state = 5;
actor->vel.y = 10.0f; actor->vel.y = 10.0f;
actor->vel.z = 5.0f; actor->vel.z = 5.0f;
Audio_PlaySfx(0x1902102FU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1902102FU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 5: case 5:
if (actor->obj.pos.y > (gGroundLevel + 70.0f)) { if (actor->obj.pos.y > (gGroundLevel + 70.0f)) {
@ -2182,10 +2183,10 @@ void func_i3_801AFA5C(Actor* actor) {
} }
if (actor->vel.z != 0) { if (actor->vel.z != 0) {
actor->vel.y = actor->vel.z = 0.0f; actor->vel.y = actor->vel.z = 0.0f;
Audio_PlaySfx(0x19402031U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19402031U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0C0 == 1) { if (actor->timer_0C0 == 1) {
Audio_PlaySfx(0x19003030U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19003030U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0C0 == 0) { if (actor->timer_0C0 == 0) {
if (actor->timer_0BE == 0) { if (actor->timer_0BE == 0) {
@ -2405,7 +2406,7 @@ void func_i3_801B10F8(Boss* bossAQ) {
bossAQ->info.hitbox[119] = 1028.0f; bossAQ->info.hitbox[119] = 1028.0f;
bossAQ->info.hitbox[169] = 800.0f; bossAQ->info.hitbox[169] = 800.0f;
bossAQ->swork[AQ_SWK_8] = bossAQ->swork[AQ_SWK_9] = 2; bossAQ->swork[AQ_SWK_8] = bossAQ->swork[AQ_SWK_9] = 2;
Audio_PlaySfx(0x3140904D, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3140904D, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
// OBJ_BOSS_AQ action // OBJ_BOSS_AQ action
@ -2470,7 +2471,7 @@ void func_i3_801B134C(Boss* bossAQ) {
D_i3_801C4308[12] = D_i3_801C4308[13] = 0.0f; D_i3_801C4308[12] = D_i3_801C4308[13] = 0.0f;
bossAQ->timer_056 = 20; bossAQ->timer_056 = 20;
bossAQ->state = 2; bossAQ->state = 2;
Audio_PlaySfx(0x1900002E, bossAQ->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900002E, bossAQ->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 2: case 2:
@ -2560,7 +2561,7 @@ void func_i3_801B134C(Boss* bossAQ) {
break; break;
case 14: case 14:
if (bossAQ->timer_056 == 58) { if (bossAQ->timer_056 == 58) {
Audio_PlaySfx(0x29408055, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29408055, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((bossAQ->timer_056 == 0) && (D_i3_801C4308[12] <= -44.0f)) { if ((bossAQ->timer_056 == 0) && (D_i3_801C4308[12] <= -44.0f)) {
bossAQ->swork[AQ_SWK_2] = bossAQ->swork[AQ_SWK_3] = 20; bossAQ->swork[AQ_SWK_2] = bossAQ->swork[AQ_SWK_3] = 20;
@ -2698,7 +2699,7 @@ void func_i3_801B134C(Boss* bossAQ) {
bossAQ->timer_052 = 0; bossAQ->timer_052 = 0;
bossAQ->swork[AQ_SWK_19] = 500; bossAQ->swork[AQ_SWK_19] = 500;
D_i3_801C4308[79] = 0.0f; D_i3_801C4308[79] = 0.0f;
Audio_PlaySfx(0x29408054, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29408054, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (bossAQ->state < 14) { if (bossAQ->state < 14) {
for (i3 = 0, actor = gActors; i3 < 60; i3++, actor++) { for (i3 = 0, actor = gActors; i3 < 60; i3++, actor++) {
if ((actor->obj.id == OBJ_ACTOR_260) && (actor->obj.status == OBJ_ACTIVE)) { if ((actor->obj.id == OBJ_ACTOR_260) && (actor->obj.status == OBJ_ACTIVE)) {
@ -2708,7 +2709,7 @@ void func_i3_801B134C(Boss* bossAQ) {
bossAQ->timer_058 = 30; bossAQ->timer_058 = 30;
bossAQ->swork[AQ_SWK_0] = 4; bossAQ->swork[AQ_SWK_0] = 4;
D_80178480 = 50; D_80178480 = 50;
Audio_PlaySfx(0x1900002D, bossAQ->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900002D, bossAQ->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f); func_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f);
var_fs3 = 80.0f; var_fs3 = 80.0f;
for (i2 = 0; i2 < 3; i2++, var_fs3 += 10.0f) { for (i2 = 0; i2 < 3; i2++, var_fs3 += 10.0f) {
@ -2757,21 +2758,24 @@ void func_i3_801B134C(Boss* bossAQ) {
D_i3_801C42A0[22] = 0; D_i3_801C42A0[22] = 0;
bossAQ->swork[AQ_SWK_12]--; bossAQ->swork[AQ_SWK_12]--;
bossAQ->swork[AQ_SWK_13] = 70; bossAQ->swork[AQ_SWK_13] = 70;
Audio_PlaySfx(0x2940604C, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940604C, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} else if (bossAQ->state >= 10) { } else if (bossAQ->state >= 10) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 14: case 14:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_8] != 0)) { } else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_8] != 0)) {
D_i3_801C42A0[1] = 50; D_i3_801C42A0[1] = 50;
sBossAQlimbTimers[AQ_LIMB_7] = 50; sBossAQlimbTimers[AQ_LIMB_7] = 50;
bossAQ->swork[AQ_SWK_8]--; bossAQ->swork[AQ_SWK_8]--;
Audio_PlaySfx(0x2903604C, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903604C, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (bossAQ->swork[AQ_SWK_8] == 0) { if (bossAQ->swork[AQ_SWK_8] == 0) {
spD4.x = D_i3_801C4308[73]; spD4.x = D_i3_801C4308[73];
spD4.y = D_i3_801C4308[74]; spD4.y = D_i3_801C4308[74];
@ -2785,12 +2789,14 @@ void func_i3_801B134C(Boss* bossAQ) {
case 15: case 15:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_9] != 0)) { } else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_9] != 0)) {
D_i3_801C42A0[2] = 50; D_i3_801C42A0[2] = 50;
sBossAQlimbTimers[AQ_LIMB_8] = 50; sBossAQlimbTimers[AQ_LIMB_8] = 50;
bossAQ->swork[AQ_SWK_9]--; bossAQ->swork[AQ_SWK_9]--;
Audio_PlaySfx(0x2903604C, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903604C, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
if (bossAQ->swork[AQ_SWK_9] == 0) { if (bossAQ->swork[AQ_SWK_9] == 0) {
spD4.x = D_i3_801C4308[76]; spD4.x = D_i3_801C4308[76];
spD4.y = D_i3_801C4308[77]; // 76? spD4.y = D_i3_801C4308[77]; // 76?
@ -2804,7 +2810,8 @@ void func_i3_801B134C(Boss* bossAQ) {
case 16: case 16:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[4] = 75; D_i3_801C42A0[4] = 75;
} }
@ -2813,7 +2820,8 @@ void func_i3_801B134C(Boss* bossAQ) {
case 17: case 17:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[5] = 75; D_i3_801C42A0[5] = 75;
} }
@ -2823,7 +2831,8 @@ void func_i3_801B134C(Boss* bossAQ) {
if ((bossAQ->damage == 31) && (bossAQ->swork[AQ_SWK_1] != 2) && (bossAQ->swork[AQ_SWK_12] == 0) && if ((bossAQ->damage == 31) && (bossAQ->swork[AQ_SWK_1] != 2) && (bossAQ->swork[AQ_SWK_12] == 0) &&
(bossAQ->state == 15) && (bossAQ->health != 0)) { (bossAQ->state == 15) && (bossAQ->health != 0)) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else { } else {
for (i7 = 0; i7 < AQ_LIMB_MAX; i7++) { for (i7 = 0; i7 < AQ_LIMB_MAX; i7++) {
sBossAQlimbTimers[i7] = 50; sBossAQlimbTimers[i7] = 50;
@ -2833,7 +2842,8 @@ void func_i3_801B134C(Boss* bossAQ) {
bossAQ->swork[AQ_SWK_13] = 40; bossAQ->swork[AQ_SWK_13] = 40;
bossAQ->swork[AQ_SWK_1] = 2; bossAQ->swork[AQ_SWK_1] = 2;
Audio_PlaySfx(0x2940804E, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940804E, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
bossAQ->health -= bossAQ->damage; bossAQ->health -= bossAQ->damage;
if ((bossAQ->swork[AQ_SWK_25] == 0) || (bossAQ->swork[AQ_SWK_25] == 2)) { if ((bossAQ->swork[AQ_SWK_25] == 0) || (bossAQ->swork[AQ_SWK_25] == 2)) {
Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY); Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY);
@ -2859,7 +2869,8 @@ void func_i3_801B134C(Boss* bossAQ) {
bossAQ->swork[AQ_SWK_13] = 40; bossAQ->swork[AQ_SWK_13] = 40;
bossAQ->swork[AQ_SWK_1] = 2; bossAQ->swork[AQ_SWK_1] = 2;
bossAQ->timer_056 = 50; bossAQ->timer_056 = 50;
Audio_PlaySfx(0x2940A04F, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940A04F, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
gShowBossHealth = false; gShowBossHealth = false;
bossAQ->state = 16; bossAQ->state = 16;
} }
@ -2870,14 +2881,15 @@ void func_i3_801B134C(Boss* bossAQ) {
case 20: case 20:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[6] = 50; D_i3_801C42A0[6] = 50;
} }
} }
break; break;
default: default:
Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -3130,7 +3142,7 @@ void func_i3_801B134C(Boss* bossAQ) {
Math_SmoothStepToF(&D_i3_801C4308[61], 0.0f, 0.3f, 0.5f, 0.0f); Math_SmoothStepToF(&D_i3_801C4308[61], 0.0f, 0.3f, 0.5f, 0.0f);
bossAQ->info.hitbox[119] = -10000.0f; bossAQ->info.hitbox[119] = -10000.0f;
if (bossAQ->swork[AQ_SWK_13] == 1) { if (bossAQ->swork[AQ_SWK_13] == 1) {
Audio_PlaySfx(0x29409051, bossAQ->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29409051, bossAQ->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if ((bossAQ->health != 0) || (bossAQ->state < 16)) { } else if ((bossAQ->health != 0) || (bossAQ->state < 16)) {
Math_SmoothStepToF(&D_i3_801C4308[54], 1.0f, 0.3f, 0.5f, 0.0f); Math_SmoothStepToF(&D_i3_801C4308[54], 1.0f, 0.3f, 0.5f, 0.0f);
@ -3864,7 +3876,7 @@ void func_i3_801B638C(Actor* actor) {
} }
func_80066254(actor); func_80066254(actor);
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
Audio_PlaySfx(0x1903001D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903001D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007A6F0(&actor->obj.pos, 0x29038090); func_8007A6F0(&actor->obj.pos, 0x29038090);
} }
actor->fwork[5] = (actor->obj.pos.y * 0.01f) + 2.5f; actor->fwork[5] = (actor->obj.pos.y * 0.01f) + 2.5f;
@ -3974,7 +3986,7 @@ void func_i3_801B638C(Actor* actor) {
if ((actor->health != 0) && (actor->unk_0D2 == 0)) { if ((actor->health != 0) && (actor->unk_0D2 == 0)) {
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3);
@ -4112,7 +4124,7 @@ void func_i3_801B6FF8(Actor* actor) {
actor->unk_0D8.y + RAND_FLOAT_CENTERED(70.0f), actor->unk_0D8.y + RAND_FLOAT_CENTERED(70.0f),
actor->unk_0D8.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); actor->unk_0D8.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1);
} }
Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= -100) { if (actor->health <= -100) {
actor->health = -100; actor->health = -100;
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3);
@ -4353,7 +4365,7 @@ void func_i3_801B7C78(Actor* actor) {
func_80081B24(actor->vwork[20 + i].x, actor->vwork[20 + i].y, actor->vwork[20 + i].z, 0.1f) + 1; func_80081B24(actor->vwork[20 + i].x, actor->vwork[20 + i].y, actor->vwork[20 + i].z, 0.1f) + 1;
} }
actor->timer_0C0 = 10; actor->timer_0C0 = 10;
Audio_PlaySfx(0x2900208D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900208D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state = 4; actor->state = 4;
} }
break; break;
@ -4389,7 +4401,7 @@ void func_i3_801B7C78(Actor* actor) {
effect->unk_44 = 2; effect->unk_44 = 2;
effect->timer_50 = 100; effect->timer_50 = 100;
actor->iwork[3] = 0; actor->iwork[3] = 0;
Audio_PlaySfx(0x2900308C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900308C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
effect->obj.pos.x = actor->vwork[21].x; effect->obj.pos.x = actor->vwork[21].x;
effect->obj.pos.y = actor->vwork[21].y; effect->obj.pos.y = actor->vwork[21].y;
@ -4487,7 +4499,7 @@ void func_i3_801B7C78(Actor* actor) {
actor->info.bonus = 1; actor->info.bonus = 1;
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
actor->timer_0BC = 50; actor->timer_0BC = 50;
} }
@ -4756,7 +4768,7 @@ void func_i3_801B91A4(Actor* actor) {
if ((actor->health != 0) && (actor->state != 0)) { if ((actor->health != 0) && (actor->state != 0)) {
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
if (actor->scale > 1.0f) { if (actor->scale > 1.0f) {
@ -4955,7 +4967,7 @@ void func_i3_801BA6A4(Actor* actor) {
actor->fwork[1] += 10.0f; actor->fwork[1] += 10.0f;
actor->vel.x = SIN_DEG(actor->fwork[1]) * 10.0f; actor->vel.x = SIN_DEG(actor->fwork[1]) * 10.0f;
if (actor->obj.pos.y < (gGroundLevel + 30.0f)) { if (actor->obj.pos.y < (gGroundLevel + 30.0f)) {
Audio_PlaySfx(0x19400007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19400007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[1] = 1; actor->iwork[1] = 1;
actor->vel.x = actor->vel.y = actor->vel.z = 0.0f; actor->vel.x = actor->vel.y = actor->vel.z = 0.0f;
actor->gravity = 0.0f; actor->gravity = 0.0f;
@ -4979,7 +4991,7 @@ void func_i3_801BA6A4(Actor* actor) {
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
} }
actor->iwork[1] = 1; actor->iwork[1] = 1;
Audio_PlaySfx(0x19400007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19400007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, actor->scale * 30.0f); func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, actor->scale * 30.0f);
} }
} else { } else {
@ -5484,7 +5496,7 @@ void func_i3_801BB79C(Actor* actor) {
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903408F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->damage != 31) { if (actor->damage != 31) {
actor->timer_0C0 = actor->timer_0C6 = 40; actor->timer_0C0 = actor->timer_0C6 = 40;
} else { } else {
@ -5614,7 +5626,7 @@ void func_i3_801BC9A0(Actor* actor) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if ((actor->health != 0) && (actor->iwork[3] == 0) && (actor->damage == 31)) { if ((actor->health != 0) && (actor->iwork[3] == 0) && (actor->damage == 31)) {
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
actor->state = 3; actor->state = 3;
@ -5803,7 +5815,7 @@ void func_i3_801BD54C(Actor* actor) {
if (fabsf(actor->fwork[5] - actor->obj.pos.z) >= var_fs0) { if (fabsf(actor->fwork[5] - actor->obj.pos.z) >= var_fs0) {
actor->state = 3; actor->state = 3;
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
Audio_PlaySfx(0x19400077, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19400077, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
// needed to match // needed to match

102
src/overlays/ovl_i3/fox_so.c
View file

@ -246,7 +246,7 @@ void func_i3_8019EA7C(Actor* actor) {
if ((actor->unk_046 == 0) || (actor->unk_046 == 1)) { if ((actor->unk_046 == 0) || (actor->unk_046 == 1)) {
actor->unk_046 = 3; actor->unk_046 = 3;
func_8005F0E8(actor->sfxPos, &actor->obj.pos); func_8005F0E8(actor->sfxPos, &actor->obj.pos);
Audio_PlaySfx(0x11002052, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11002052, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (func_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { if (func_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) {
D_801782EC[sp30] = actor->fwork[0]; D_801782EC[sp30] = actor->fwork[0];
@ -316,7 +316,7 @@ void func_i3_8019EF30(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
if (gBossActive != 0) { if (gBossActive != 0) {
actor->info.bonus = 0; actor->info.bonus = 0;
} }
Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void func_i3_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -347,7 +347,7 @@ void func_i3_8019F0B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
if (gBossActive != 0) { if (gBossActive != 0) {
actor->info.bonus = 0; actor->info.bonus = 0;
} }
Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void func_i3_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -412,7 +412,7 @@ void func_i3_8019F20C(Actor* actor) {
RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1);
} }
actor->timer_0C2 = 5; actor->timer_0C2 = 5;
Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29000071, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2: case 2:
actor->gravity = 0.5f; actor->gravity = 0.5f;
@ -652,7 +652,7 @@ void func_i3_801A003C(Actor* actor) {
actor->timer_0BE = 50; actor->timer_0BE = 50;
actor->unk_04E = 0; actor->unk_04E = 0;
func_8005F0E8(actor->sfxPos, &actor->obj.pos); func_8005F0E8(actor->sfxPos, &actor->obj.pos);
Audio_PlaySfx(0x19035053, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -693,7 +693,7 @@ void func_i3_801A0120(Effect* effect) {
if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) {
effect->unk_48 = 1; effect->unk_48 = 1;
if (effect->scale2 == 20.0f) { if (effect->scale2 == 20.0f) {
Audio_PlaySfx(0x19035054, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035054, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
effect->unk_48 = 0; effect->unk_48 = 0;
@ -764,7 +764,7 @@ void func_i3_801A0120(Effect* effect) {
if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) {
effect->unk_48 = 1; effect->unk_48 = 1;
if (effect->scale2 == 20.0f) { if (effect->scale2 == 20.0f) {
Audio_PlaySfx(0x19035054, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035054, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
effect->unk_48 = 0; effect->unk_48 = 0;
@ -794,7 +794,7 @@ void func_i3_801A0120(Effect* effect) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) {
func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f);
if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) {
Audio_PlaySfx(0x31033078, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31033078, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
effect->vel.z += 65.0f; effect->vel.z += 65.0f;
@ -818,7 +818,7 @@ void func_i3_801A0120(Effect* effect) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) {
func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f);
if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) {
Audio_PlaySfx(0x31033078, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31033078, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) { } else if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) {
func_8001A55C(effect->sfxPos, 0x31033078); func_8001A55C(effect->sfxPos, 0x31033078);
@ -923,7 +923,7 @@ void func_i3_801A0DF8(f32 xPos, f32 zPos, f32 yRot, s32 index, f32 yPos) {
gActors[sp2C].unk_04E = 0; gActors[sp2C].unk_04E = 0;
gActors[sp2C].obj.pos.y = -1.0f * yPos; gActors[sp2C].obj.pos.y = -1.0f * yPos;
func_8005F0E8(gActors[sp2C].sfxPos, &gActors[sp2C].obj.pos); func_8005F0E8(gActors[sp2C].sfxPos, &gActors[sp2C].obj.pos);
Audio_PlaySfx(0x19035053, gActors[sp2C].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, gActors[sp2C].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -942,7 +942,7 @@ void func_i3_801A0FD4(Actor* actor, s32 index) {
actor->obj.rot.x = 0.0f; actor->obj.rot.x = 0.0f;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -981,7 +981,7 @@ void func_i3_801A10F4(Player* player) {
D_80178340 = 255; D_80178340 = 255;
D_80178358 = 0; D_80178358 = 0;
func_i3_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f); func_i3_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f);
Audio_PlaySfx(0x3140807E, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3140807E, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1: case 1:
D_80177CE8 += 30.0f; D_80177CE8 += 30.0f;
@ -1122,7 +1122,7 @@ void func_i3_801A10F4(Player* player) {
D_80177950 = 1.0f; D_80177950 = 1.0f;
func_8001D1C8(0xFF, 3); func_8001D1C8(0xFF, 3);
Audio_PlaySfx(0x4100C023, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4100C023, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178488 = 1; D_80178488 = 1;
D_80178358 = 0; D_80178358 = 0;
player->timer_1F8 = 15; player->timer_1F8 = 15;
@ -1256,7 +1256,7 @@ void func_i3_801A1F80(Boss* bossSO) {
} }
if (gBossFrameCount == 60) { if (gBossFrameCount == 60) {
gActors[10].unk_0D0 = 3; gActors[10].unk_0D0 = 3;
Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->timer_050 == 100) { if (bossSO->timer_050 == 100) {
bossSO->unk_04C = 0; bossSO->unk_04C = 0;
@ -1317,10 +1317,10 @@ void func_i3_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 29) { if (bossSO->unk_04C == 29) {
func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos); func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos);
Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 80) { if (bossSO->unk_04C == 80) {
Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C >= 94) { if (bossSO->unk_04C >= 94) {
bossSO->info.hitbox[38] = 220.0f; bossSO->info.hitbox[38] = 220.0f;
@ -1344,10 +1344,10 @@ void func_i3_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 10) { if (bossSO->unk_04C == 10) {
func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos); func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos);
Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 50) { if (bossSO->unk_04C == 50) {
Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C >= 85) { if (bossSO->unk_04C >= 85) {
bossSO->info.hitbox[20] = 220.0f; bossSO->info.hitbox[20] = 220.0f;
@ -1397,10 +1397,10 @@ void func_i3_801A23F4(Boss* bossSO) {
} }
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 1) { if (bossSO->unk_04C == 1) {
Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C >= 100) { if (bossSO->unk_04C >= 100) {
Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 2.0f, 1.0f); Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 2.0f, 1.0f);
@ -1436,10 +1436,10 @@ void func_i3_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 5) { if (bossSO->unk_04C == 5) {
func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos); func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos);
Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 20) { if (bossSO->unk_04C == 20) {
Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C > 36) { if (bossSO->unk_04C > 36) {
bossSO->info.hitbox[20] = 220.0f; bossSO->info.hitbox[20] = 220.0f;
@ -1489,7 +1489,7 @@ void func_i3_801A2C98(Boss* bossSO) {
} }
if (bossSO->unk_04C == 20) { if (bossSO->unk_04C == 20) {
gActors[10].unk_0D0 = 3; gActors[10].unk_0D0 = 3;
Audio_PlaySfx(0x19036054, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19036054, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 0) { if (bossSO->unk_04C == 0) {
bossSO->state++; bossSO->state++;
@ -1523,7 +1523,7 @@ void func_i3_801A2C98(Boss* bossSO) {
} }
if (bossSO->swork[SO_SWK_11] == 50) { if (bossSO->swork[SO_SWK_11] == 50) {
gActors[9].unk_0D0 = 3; gActors[9].unk_0D0 = 3;
Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1550,7 +1550,7 @@ void func_i3_801A3128(Boss* bossSO) {
} }
if (bossSO->unk_04C == 40) { if (bossSO->unk_04C == 40) {
gActors[10].unk_0D0 = 3; gActors[10].unk_0D0 = 3;
Audio_PlaySfx(0x19036054, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19036054, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 0) { if (bossSO->unk_04C == 0) {
bossSO->state++; bossSO->state++;
@ -1600,7 +1600,7 @@ void func_i3_801A3128(Boss* bossSO) {
} }
if (bossSO->swork[SO_SWK_11] == 50) { if (bossSO->swork[SO_SWK_11] == 50) {
gActors[9].unk_0D0 = 3; gActors[9].unk_0D0 = 3;
Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19036053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1642,10 +1642,10 @@ void func_i3_801A3510(Boss* bossSO) {
} }
if (bossSO->unk_04C == 29) { if (bossSO->unk_04C == 29) {
func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos); func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos);
Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 80) { if (bossSO->unk_04C == 80) {
Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 94) { if (bossSO->unk_04C == 94) {
func_i3_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4, func_i3_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4,
@ -1661,10 +1661,10 @@ void func_i3_801A3510(Boss* bossSO) {
Math_SmoothStepToAngle(&bossSO->obj.rot.x, 20.0f, 0.1f, 10.0f, 0.1f); Math_SmoothStepToAngle(&bossSO->obj.rot.x, 20.0f, 0.1f, 10.0f, 0.1f);
if (bossSO->unk_04C == 10) { if (bossSO->unk_04C == 10) {
func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos); func_8005F0E8(bossSO->sfxPos, &bossSO->obj.pos);
Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19035053, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 50) { if (bossSO->unk_04C == 50) {
Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432077, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C == 60) { if (bossSO->unk_04C == 60) {
func_i3_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2); func_i3_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2);
@ -1692,7 +1692,7 @@ void func_i3_801A3510(Boss* bossSO) {
break; break;
case 8: case 8:
if (bossSO->unk_04C == 65) { if (bossSO->unk_04C == 65) {
Audio_PlaySfx(0x31033078, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31033078, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1715,7 +1715,7 @@ void func_i3_801A3510(Boss* bossSO) {
case 9: case 9:
bossSO->unk_04C++; bossSO->unk_04C++;
if (bossSO->unk_04C == 66) { if (bossSO->unk_04C == 66) {
Audio_PlaySfx(0x31033078, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31033078, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1756,13 +1756,13 @@ void func_i3_801A3C4C(Boss* bossSO) {
bossSO->swork[SO_SWK_10] = 20; bossSO->swork[SO_SWK_10] = 20;
if (bossSO->health > 0.0f) { if (bossSO->health > 0.0f) {
Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO) {} if (bossSO) {}
} }
bossSO->timer_058 = 20; bossSO->timer_058 = 20;
if ((bossSO->dmgPart >= 1) && (bossSO->dmgPart <= 3) && (bossSO->swork[SO_SWK_2] != 0)) { if ((bossSO->dmgPart >= 1) && (bossSO->dmgPart <= 3) && (bossSO->swork[SO_SWK_2] != 0)) {
Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossSO->swork[SO_SWK_2] -= bossSO->damage; bossSO->swork[SO_SWK_2] -= bossSO->damage;
if (bossSO->swork[SO_SWK_2] < 0) { if (bossSO->swork[SO_SWK_2] < 0) {
bossSO->swork[SO_SWK_2] = 0; bossSO->swork[SO_SWK_2] = 0;
@ -1778,7 +1778,7 @@ void func_i3_801A3C4C(Boss* bossSO) {
} }
} }
if ((bossSO->dmgPart >= 4) && (bossSO->dmgPart <= 6) && (bossSO->swork[SO_SWK_3] != 0)) { if ((bossSO->dmgPart >= 4) && (bossSO->dmgPart <= 6) && (bossSO->swork[SO_SWK_3] != 0)) {
Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossSO->swork[SO_SWK_3] -= bossSO->damage; bossSO->swork[SO_SWK_3] -= bossSO->damage;
if (bossSO->swork[SO_SWK_3] < 0) { if (bossSO->swork[SO_SWK_3] < 0) {
bossSO->swork[SO_SWK_3] = 0; bossSO->swork[SO_SWK_3] = 0;
@ -1810,7 +1810,7 @@ void func_i3_801A3C4C(Boss* bossSO) {
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
func_8001A838(0x4100C023); func_8001A838(0x4100C023);
Audio_PlaySfx(0x2940D09A, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7;
gPlayer[0].timer_1F8 = 0; gPlayer[0].timer_1F8 = 0;
@ -1871,7 +1871,7 @@ void func_i3_801A4214(Boss* bossSO) {
bossSO->unk_04C = 50; bossSO->unk_04C = 50;
bossSO->state++; bossSO->state++;
gShowBossHealth = false; gShowBossHealth = false;
Audio_PlaySfx(0x39439076, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39439076, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_i3_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6], func_i3_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6],
bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f), bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f),
80.0f, 40.0f, 8); 80.0f, 40.0f, 8);
@ -1934,7 +1934,7 @@ void func_i3_801A4214(Boss* bossSO) {
D_i3_801C2768[13] = 0.0f; D_i3_801C2768[13] = 0.0f;
} }
if (gCsFrameCount == 230) { if (gCsFrameCount == 230) {
Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801779A8[gMainController] = 120.0f; D_801779A8[gMainController] = 120.0f;
} }
if (gCsFrameCount == 250) { if (gCsFrameCount == 250) {
@ -1961,7 +1961,7 @@ void func_i3_801A4214(Boss* bossSO) {
void func_i3_801A48B8(Boss* bossSO) { void func_i3_801A48B8(Boss* bossSO) {
s32 i; s32 i;
Audio_PlaySfx(0x29434075, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29434075, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80137E84[gMainController] = 1; D_80137E84[gMainController] = 1;
D_Timer_80177BD0[gMainController] = 10; D_Timer_80177BD0[gMainController] = 10;
if (bossSO->swork[SO_SWK_0] != 6) { if (bossSO->swork[SO_SWK_0] != 6) {
@ -2016,11 +2016,11 @@ void func_i3_801A4A34(Boss* bossSO) {
} }
switch (bossSO->unk_04C) { switch (bossSO->unk_04C) {
case 30: case 30:
Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433074, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
/* fallthrough */ /* fallthrough */
case 35: case 35:
case 97: case 97:
Audio_PlaySfx(0x29434075, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29434075, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
if (bossSO->unk_04C == 119) { if (bossSO->unk_04C == 119) {
@ -2060,13 +2060,13 @@ void func_i3_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 56; bossSO->unk_04C = 56;
} }
if (bossSO->obj.rot.y == 0.0f) { if (bossSO->obj.rot.y == 0.0f) {
Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
bossSO->fwork[SO_FWK_31] += 0.5f; bossSO->fwork[SO_FWK_31] += 0.5f;
bossSO->obj.rot.y += bossSO->fwork[SO_FWK_31]; bossSO->obj.rot.y += bossSO->fwork[SO_FWK_31];
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
bossSO->unk_078.y = bossSO->obj.rot.y; bossSO->unk_078.y = bossSO->obj.rot.y;
break; break;
@ -2075,7 +2075,7 @@ void func_i3_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 56; bossSO->unk_04C = 56;
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39033079, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->swork[SO_SWK_11] <= 45) { if (bossSO->swork[SO_SWK_11] <= 45) {
Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 20.0f, 0.1f); Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 20.0f, 0.1f);
@ -2125,7 +2125,7 @@ void func_i3_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 98; bossSO->unk_04C = 98;
bossSO->unk_078.y += bossSO->fwork[SO_FWK_31]; bossSO->unk_078.y += bossSO->fwork[SO_FWK_31];
if (bossSO->swork[SO_SWK_11] == 170) { if (bossSO->swork[SO_SWK_11] == 170) {
Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
bossSO->obj.pos.y = -500.0f; bossSO->obj.pos.y = -500.0f;
gActors[9].unk_0D0 = 2; gActors[9].unk_0D0 = 2;
} }
@ -2372,7 +2372,7 @@ void func_i3_801A5B3C(Boss* bossSO) {
case 0: case 0:
bossSO->unk_04C++; bossSO->unk_04C++;
if (bossSO->unk_04C == 75) { if (bossSO->unk_04C == 75) {
Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C >= Animation_GetFrameCount(&D_601388C)) { if (bossSO->unk_04C >= Animation_GetFrameCount(&D_601388C)) {
if (bossSO->health != 0) { if (bossSO->health != 0) {
@ -2418,7 +2418,7 @@ void func_i3_801A5B3C(Boss* bossSO) {
case 9: case 9:
bossSO->unk_04C++; bossSO->unk_04C++;
if ((bossSO->unk_04C == 45) && (bossSO->health != 0)) { if ((bossSO->unk_04C == 45) && (bossSO->health != 0)) {
Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29432073, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossSO->unk_04C >= Animation_GetFrameCount(&D_6012C00_Anim)) { if (bossSO->unk_04C >= Animation_GetFrameCount(&D_6012C00_Anim)) {
bossSO->unk_04C = 0; bossSO->unk_04C = 0;
@ -2475,7 +2475,7 @@ void func_i3_801A5B3C(Boss* bossSO) {
Math_SmoothStepToVec3fArray(sp50, bossSO->vwork, 1, sp1BC, bossSO->fwork[SO_FWK_0], 100.0f, 0.0f); Math_SmoothStepToVec3fArray(sp50, bossSO->vwork, 1, sp1BC, bossSO->fwork[SO_FWK_0], 100.0f, 0.0f);
if ((bossSO->dmgType != DMG_NONE) && (bossSO->health > 0)) { if ((bossSO->dmgType != DMG_NONE) && (bossSO->health > 0)) {
bossSO->dmgType = DMG_NONE; bossSO->dmgType = DMG_NONE;
Audio_PlaySfx(0x29121007, bossSO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossSO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (!((bossSO->swork[SO_SWK_0] == 0) || (bossSO->swork[SO_SWK_0] == 2) || (bossSO->swork[SO_SWK_0] == 3) || if (!((bossSO->swork[SO_SWK_0] == 0) || (bossSO->swork[SO_SWK_0] == 2) || (bossSO->swork[SO_SWK_0] == 3) ||
(bossSO->swork[SO_SWK_0] == 6) || ((bossSO->swork[SO_SWK_0] == 7) && (bossSO->state == 2)))) { (bossSO->swork[SO_SWK_0] == 6) || ((bossSO->swork[SO_SWK_0] == 7) && (bossSO->state == 2)))) {
func_i3_801A3C4C(bossSO); func_i3_801A3C4C(bossSO);
@ -2794,7 +2794,7 @@ void func_i3_801A7750(void) {
actor->state = 1; actor->state = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -3077,7 +3077,7 @@ void func_i3_801A7930(Player* player) {
D_80177830 = 0; D_80177830 = 0;
break; break;
case 1460: case 1460:
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
case 1400: case 1400:
@ -3142,7 +3142,7 @@ void func_i3_801A8BE8(Actor* actor) {
break; break;
case 2: case 2:
actor->state = 3; actor->state = 3;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:

90
src/overlays/ovl_i3/fox_zo.c
View file

@ -727,7 +727,7 @@ void func_i3_801904CC(Actor* actor) {
if (actor->state > 0) { if (actor->state > 0) {
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
actor->state = 1; actor->state = 1;
@ -791,16 +791,16 @@ void func_i3_80190A00(Actor* actor) {
func_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) { func_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) {
func_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f); func_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f);
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->timer_0C0 = 30; actor->timer_0C0 = 30;
} }
func_i3_80190790(actor); func_i3_80190790(actor);
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -938,9 +938,9 @@ void func_i3_80191010(Actor* actor) {
if (func_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && if (func_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) &&
(actor->iwork[0] < 2) && (actor->timer_0C0 == 0)) { (actor->iwork[0] < 2) && (actor->timer_0C0 == 0)) {
if (var_fs0 == 5.0f) { if (var_fs0 == 5.0f) {
Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->timer_0C0 = 10; actor->timer_0C0 = 10;
actor->iwork[0] += 1; actor->iwork[0] += 1;
@ -955,7 +955,7 @@ void func_i3_80191010(Actor* actor) {
actor->unk_044 = 4; actor->unk_044 = 4;
func_80066254(actor); func_80066254(actor);
func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f);
Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
func_8007A6F0(&actor->obj.pos, 0x29018036); func_8007A6F0(&actor->obj.pos, 0x29018036);
break; break;
@ -1023,12 +1023,12 @@ void func_i3_80191680(Actor* actor) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29033037, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = actor->unk_044 = 0; actor->health = actor->unk_044 = 0;
func_80066254(actor); func_80066254(actor);
actor->state = 1; actor->state = 1;
Audio_PlaySfx(0x29018036, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29018036, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
actor->unk_0B6++; actor->unk_0B6++;
@ -1106,7 +1106,7 @@ void func_i3_80191BC4(Actor* actor) {
if ((actor->vel.y != 0.0f) && (actor->iwork[1] == 0)) { if ((actor->vel.y != 0.0f) && (actor->iwork[1] == 0)) {
actor->iwork[1] = 1; actor->iwork[1] = 1;
Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (func_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) { if (func_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) {
func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7); func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7);
@ -1202,9 +1202,9 @@ void func_i3_80192094(Actor* actor) {
func_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f); func_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f);
actor->iwork[0] += 1; actor->iwork[0] += 1;
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
switch (actor->state) { switch (actor->state) {
@ -1393,9 +1393,9 @@ void func_i3_80192834(Actor* actor) {
actor->iwork[0]++; actor->iwork[0]++;
func_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f); func_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f);
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1514,7 +1514,7 @@ void func_i3_80192E64(Actor* actor) {
actor->state = 3; actor->state = 3;
} }
} else { } else {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
} }
@ -2172,9 +2172,9 @@ void func_i3_80194A84(Boss* bossZO) {
} }
func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC); func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC);
if (bossZO->timer_050 == 43) { if (bossZO->timer_050 == 43) {
Audio_PlaySfx(0x1983201A, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
bossZO->swork[ZO_SWK_12]++; bossZO->swork[ZO_SWK_12]++;
} }
@ -2785,7 +2785,7 @@ void func_i3_80194A84(Boss* bossZO) {
dmgType = bossZO->dmgType; dmgType = bossZO->dmgType;
bossZO->dmgType = DMG_NONE; bossZO->dmgType = DMG_NONE;
if (dmgType == DMG_BEAM) { if (dmgType == DMG_BEAM) {
Audio_PlaySfx(0x29121007, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
switch (bossZO->dmgPart) { switch (bossZO->dmgPart) {
case 0: case 0:
@ -2870,19 +2870,19 @@ void func_i3_80194A84(Boss* bossZO) {
sZoLimbTimers[ZO_LIMB_25] = sZoLimbTimers[ZO_LIMB_36] = 15; sZoLimbTimers[ZO_LIMB_25] = sZoLimbTimers[ZO_LIMB_36] = 15;
bossZO->health -= bossZO->damage; bossZO->health -= bossZO->damage;
if (bossZO->health < 150) { if (bossZO->health < 150) {
Audio_PlaySfx(0x2943500F, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29034003, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (bossZO->health <= 0) { if (bossZO->health <= 0) {
D_8017796C = -1; D_8017796C = -1;
func_800182F4(0x102800FF); func_800182F4(0x102800FF);
func_800182F4(0x112800FF); func_800182F4(0x112800FF);
Audio_KillSfx(bossZO->sfxPos); Audio_KillSfx(bossZO->sfxPos);
Audio_PlaySfx(0x2940D09A, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
sZoSwork[ZO_BSS_8] = bossZO->health = sZoSwork[ZO_BSS_24] = 0; sZoSwork[ZO_BSS_8] = bossZO->health = sZoSwork[ZO_BSS_24] = 0;
bossZO->timer_050 = 100; bossZO->timer_050 = 100;
Audio_PlaySfx(0x2940D09A, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
sZoFwork[ZO_BSF_27] = 20.0f; sZoFwork[ZO_BSF_27] = 20.0f;
sZoFwork[ZO_BSF_26] = 50.0f; sZoFwork[ZO_BSF_26] = 50.0f;
sZoFwork[ZO_BSF_28] = -2600.0f; sZoFwork[ZO_BSF_28] = -2600.0f;
@ -3150,7 +3150,7 @@ void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32
newActor->vel.z = bossZO->vel.z + sp54.z; newActor->vel.z = bossZO->vel.z + sp54.z;
Object_SetInfo(&newActor->info, newActor->obj.id); Object_SetInfo(&newActor->info, newActor->obj.id);
sZoFwork[ZO_BSF_35 + arg1] = 40.0f; sZoFwork[ZO_BSF_35 + arg1] = 40.0f;
Audio_PlaySfx(0x2903203B, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903203B, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (sp50 = 0; sp50 < 4; sp50++) { for (sp50 = 0; sp50 < 4; sp50++) {
func_i3_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f), func_i3_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f),
newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f); newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f);
@ -3191,7 +3191,7 @@ void func_i3_801989FC(Boss* bossZO) {
newActor->vel.x = sp64.x; newActor->vel.x = sp64.x;
newActor->vel.z = bossZO->vel.z + sp64.z; newActor->vel.z = bossZO->vel.z + sp64.z;
Object_SetInfo(&newActor->info, newActor->obj.id); Object_SetInfo(&newActor->info, newActor->obj.id);
Audio_PlaySfx(0x2903101B, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903101B, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -3207,7 +3207,7 @@ void func_i3_80198BE8(Boss* bossZO, s32 arg1) {
if ((sZoSwork[ZO_BSS_2 + arg1] == 0) && (sZoSwork[ZO_BSS_39 + arg1] == 0)) { if ((sZoSwork[ZO_BSS_2 + arg1] == 0) && (sZoSwork[ZO_BSS_39 + arg1] == 0)) {
if ((arg1 == 0) && (sZoSwork[ZO_BSS_41] == 0)) { if ((arg1 == 0) && (sZoSwork[ZO_BSS_41] == 0)) {
Audio_PlaySfx(0x31034025, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31034025, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
sZoSwork[ZO_BSS_2 + arg1] = 2; sZoSwork[ZO_BSS_2 + arg1] = 2;
sZoSwork[ZO_BSS_41 + arg1]++; sZoSwork[ZO_BSS_41 + arg1]++;
@ -3349,7 +3349,7 @@ void func_i3_80199394(Boss* bossZO, s32 arg1) {
bossZO->timer_050 = 20; bossZO->timer_050 = 20;
sZoFwork[ZO_BSF_17 + arg1] = sZoFwork[ZO_BSF_77] = 0.0f; sZoFwork[ZO_BSF_17 + arg1] = sZoFwork[ZO_BSF_77] = 0.0f;
sZoSwork[ZO_BSS_16] = 3; sZoSwork[ZO_BSS_16] = 3;
Audio_PlaySfx(0x29433022, bossZO->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433022, bossZO->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_80199470(Boss* bossZO, s32 arg1) { void func_i3_80199470(Boss* bossZO, s32 arg1) {
@ -3476,7 +3476,7 @@ void func_i3_80199A28(Actor* actor) {
(actor->iwork[1] == 0)) { (actor->iwork[1] == 0)) {
func_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f); func_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f);
actor->iwork[1]++; actor->iwork[1]++;
Audio_PlaySfx(0x19000020, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000020, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->vel.y, -60.0f, 0.5f, 5.0f, 0.00001f); Math_SmoothStepToF(&actor->vel.y, -60.0f, 0.5f, 5.0f, 0.00001f);
if (actor->obj.pos.y < -30.0f) { if (actor->obj.pos.y < -30.0f) {
@ -3557,12 +3557,12 @@ void func_i3_80199F10(Actor* actor) {
switch (sZoSwork[ZO_BSS_16]) { /* switch 1; irregular */ switch (sZoSwork[ZO_BSS_16]) { /* switch 1; irregular */
case 1: case 1:
actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y]; actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y];
Audio_PlaySfx(0x3100503E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100503E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
break; break;
case 2: case 2:
actor->fwork[1] = sZoFwork[ZO_BSF_71_Y] - sZoFwork[ZO_BSF_60_Y]; actor->fwork[1] = sZoFwork[ZO_BSF_71_Y] - sZoFwork[ZO_BSF_60_Y];
Audio_PlaySfx(0x3100503E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100503E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
break; break;
} }
@ -3596,7 +3596,7 @@ void func_i3_80199F10(Actor* actor) {
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
if (actor->unk_0D0 == 1) { if (actor->unk_0D0 == 1) {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
} }
@ -3697,7 +3697,7 @@ void func_i3_8019A5D4(Actor* actor) {
actor->timer_0BC = (s32) ((fabsf(sZoFwork[ZO_BSF_28] - -2600.0f) / 100.0f) + 30.0f); actor->timer_0BC = (s32) ((fabsf(sZoFwork[ZO_BSF_28] - -2600.0f) / 100.0f) + 30.0f);
actor->timer_0C0 = 3; actor->timer_0C0 = 3;
Audio_PlaySfx(0x2900403D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900403D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
} }
break; break;
@ -3713,7 +3713,7 @@ void func_i3_8019A5D4(Actor* actor) {
actor->fwork[5] = actor->vel.y * -3.0f; actor->fwork[5] = actor->vel.y * -3.0f;
if (actor->obj.pos.y < -150.0f) { if (actor->obj.pos.y < -150.0f) {
actor->gravity = 0.0f; actor->gravity = 0.0f;
Audio_PlaySfx(0x19003021, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19003021, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state++; actor->state++;
} }
} }
@ -3736,7 +3736,7 @@ void func_i3_8019A5D4(Actor* actor) {
} }
if (func_80062DBC(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f, 0.0f) != 0) { if (func_80062DBC(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f, 0.0f) != 0) {
actor->fwork[6] = 50.0f; actor->fwork[6] = 50.0f;
Audio_PlaySfx(0x19030003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->vel.z += actor->fwork[6] * 0.8f; actor->vel.z += actor->fwork[6] * 0.8f;
actor->vel.y += actor->fwork[6] * 1.4f; actor->vel.y += actor->fwork[6] * 1.4f;
@ -3747,7 +3747,7 @@ void func_i3_8019A5D4(Actor* actor) {
if ((sp4C <= 30.0f) && (sp48 <= 30.0f)) { if ((sp4C <= 30.0f) && (sp48 <= 30.0f)) {
actor->state = 0; actor->state = 0;
Audio_KillSfx(actor->sfxPos); Audio_KillSfx(actor->sfxPos);
Audio_PlaySfx(0x29433022, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29433022, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0BC = 40; actor->timer_0BC = 40;
sZoFwork[ZO_BSF_74] = sZoFwork[ZO_BSF_75] = 0.0f; sZoFwork[ZO_BSF_74] = sZoFwork[ZO_BSF_75] = 0.0f;
sZoSwork[ZO_BSS_19] = 1; sZoSwork[ZO_BSS_19] = 1;
@ -3758,7 +3758,7 @@ void func_i3_8019A5D4(Actor* actor) {
func_i3_8018FF50(actor); func_i3_8018FF50(actor);
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
if (actor->unk_0D0 == 1) { if (actor->unk_0D0 == 1) {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
} }
@ -3767,9 +3767,9 @@ void func_i3_8019A5D4(Actor* actor) {
func_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f); func_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f);
actor->iwork[0]++; actor->iwork[0]++;
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1983201A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19832019, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -3930,7 +3930,7 @@ void func_i3_8019B1F0(Actor* actor) {
} }
} }
actor->obj.rot.x = 0.0f; actor->obj.rot.x = 0.0f;
Audio_PlaySfx(0x3100203A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100203A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i3_8019B548(Actor* actor) { void func_i3_8019B548(Actor* actor) {
@ -4002,7 +4002,7 @@ void func_i3_8019B854(Actor* actor) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
switch (actor->state) { switch (actor->state) {
case 0: case 0:
@ -4237,7 +4237,7 @@ void func_i3_8019C454(Actor* actor) {
Math_SmoothStepToAngle(&actor->fwork[6], 10.0f, 0.1f, 1.0f, 0.01f); Math_SmoothStepToAngle(&actor->fwork[6], 10.0f, 0.1f, 1.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[5], 1.0f, actor->fwork[6], 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[5], 1.0f, actor->fwork[6], 0.01f);
if (actor->fwork[5] != actor->obj.rot.y) { if (actor->fwork[5] != actor->obj.rot.y) {
Audio_PlaySfx(0x1900001B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900001B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (1) {} if (1) {}
} }
@ -4465,15 +4465,15 @@ void func_i3_8019D15C(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if (actor->unk_0D2 < 2) { if (actor->unk_0D2 < 2) {
Audio_PlaySfx(0x1903001E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903001E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if ((actor->obj.pos.y + 268.0f) < actor->unk_0D8.y) { if ((actor->obj.pos.y + 268.0f) < actor->unk_0D8.y) {
actor->fwork[1] = 20.0f; actor->fwork[1] = 20.0f;
} else { } else {
actor->fwork[1] = -20.0f; actor->fwork[1] = -20.0f;
} }
Audio_PlaySfx(0x1903001F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903001F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (actor->unk_046 != 0) { if (actor->unk_046 != 0) {
@ -4797,7 +4797,7 @@ void func_i3_8019D76C(Player* player) {
D_80177830 = 0; D_80177830 = 0;
break; break;
case 1180: case 1180:
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
case 1240: case 1240:
@ -4871,7 +4871,7 @@ void func_i3_8019E5F0(Actor* actor) {
break; break;
case 2: case 2:
actor->state = 3; actor->state = 3;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:

42
src/overlays/ovl_i4/fox_bo.c
View file

@ -80,7 +80,7 @@ void func_i4_8018BD60(Actor* actor) {
actorPtr->unk_044 = 2; actorPtr->unk_044 = 2;
actorPtr->unk_0E4 = i; actorPtr->unk_0E4 = i;
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
Audio_PlaySfx(0x3100000CU, actorPtr->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actorPtr->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -108,7 +108,7 @@ void func_i4_8018BEF8(Actor* actor, s32 arg1) {
} else { } else {
actorPtr->obj.pos.x = D_i4_8019EEE4[actor->unk_04E]; actorPtr->obj.pos.x = D_i4_8019EEE4[actor->unk_04E];
actorPtr->obj.pos.y = 50.0f; actorPtr->obj.pos.y = 50.0f;
Audio_PlaySfx(0x2903305FU, actorPtr->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903305FU, actorPtr->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actorPtr->timer_0BC = 5; actorPtr->timer_0BC = 5;
actorPtr->timer_0C2 = 100; actorPtr->timer_0C2 = 100;
actorPtr->unk_0F4.x = 90.0f; actorPtr->unk_0F4.x = 90.0f;
@ -150,7 +150,7 @@ void func_i4_8018BEF8(Actor* actor, s32 arg1) {
} }
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
Audio_PlaySfx(0x3100000CU, actorPtr->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actorPtr->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_04E++; actor->unk_04E++;
if (actor->unk_04E >= 5) { if (actor->unk_04E >= 5) {
@ -234,8 +234,8 @@ void func_i4_8018C158(Actor* actor) {
} }
func_8002EE34(); func_8002EE34();
actor->state = 6; actor->state = 6;
Audio_PlaySfx(0x31009063U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31009063U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x2940D09AU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09AU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
for (actorPtr = &gActors[10], i = 0; i < 20; i++, actorPtr++) { for (actorPtr = &gActors[10], i = 0; i < 20; i++, actorPtr++) {
@ -664,7 +664,7 @@ bool func_i4_8018D584(Actor* actor) {
if ((actor->unk_0D2 < 2) && (actor->state == 0)) { if ((actor->unk_0D2 < 2) && (actor->state == 0)) {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29024003U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29024003U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->health += actor->damage; actor->health += actor->damage;
if (actor->health < 100) { if (actor->health < 100) {
@ -689,7 +689,7 @@ bool func_i4_8018D584(Actor* actor) {
func_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5); func_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6011BA4); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6011BA4);
func_8001A55C(actor->sfxPos, 0x11000028U); func_8001A55C(actor->sfxPos, 0x11000028U);
Audio_PlaySfx(0x2903B009U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
func_8007A6F0(&actor->obj.pos, 0x29121007); func_8007A6F0(&actor->obj.pos, 0x29121007);
} }
@ -1002,7 +1002,7 @@ void func_i4_8018EAEC(Actor* actor, s32 index) {
actor->unk_0F4.y = D_i4_8019F018[index]; actor->unk_0F4.y = D_i4_8019F018[index];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_8018EC1C(void) { void func_i4_8018EC1C(void) {
@ -1050,7 +1050,7 @@ void func_i4_8018ED44(void) {
actor->unk_0B6 = 31; actor->unk_0B6 = 31;
actor->vel.z = 200.0f; actor->vel.z = 200.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x29002002U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -1074,7 +1074,7 @@ void func_i4_8018EE4C(f32 x, f32 y) {
actor->obj.rot.z = RAND_FLOAT_CENTERED(120.0f); actor->obj.rot.z = RAND_FLOAT_CENTERED(120.0f);
actor->unk_0F4.z = RAND_FLOAT_CENTERED(1.0f); actor->unk_0F4.z = RAND_FLOAT_CENTERED(1.0f);
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x29002002U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29002002U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -1316,7 +1316,7 @@ void func_i4_8018F83C(Actor* actor, s32 arg1) {
actor->vel.z = -gPlayer[0].unk_0D0; actor->vel.z = -gPlayer[0].unk_0D0;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_8018F94C(Player* player) { void func_i4_8018F94C(Player* player) {
@ -1348,7 +1348,7 @@ void func_i4_8018F94C(Player* player) {
if (player->timer_1F8 == 0) { if (player->timer_1F8 == 0) {
player->unk_1D0 = 1; player->unk_1D0 = 1;
player->timer_1F8 = 200; player->timer_1F8 = 200;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
D_80161A44 = 30000.0f; D_80161A44 = 30000.0f;
@ -1416,7 +1416,7 @@ void func_i4_8018F94C(Player* player) {
gGroundLevel = -10000.0f; gGroundLevel = -10000.0f;
player->unk_240 = 1; player->unk_240 = 1;
player->wings.unk_2C = 1; player->wings.unk_2C = 1;
Audio_PlaySfx(0x31009063U, actor50->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31009063U, actor50->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001C8B8(0); func_8001C8B8(0);
} }
break; break;
@ -1463,7 +1463,7 @@ void func_i4_8018F94C(Player* player) {
case 95: case 95:
Audio_KillSfx(actor50->sfxPos); Audio_KillSfx(actor50->sfxPos);
Audio_PlaySfx(0x2902F026U, gActors[0].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902F026U, gActors[0].sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 0; i < ARRAY_COUNT(gEffects); i++) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos); Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos);
@ -1567,7 +1567,7 @@ void func_i4_8018F94C(Player* player) {
player->timer_1F8 = 0x32; player->timer_1F8 = 0x32;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
break; break;
@ -1721,7 +1721,7 @@ void func_i4_80190D98(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f3
effect->vel.y = dest.y; effect->vel.y = dest.y;
effect->vel.z = dest.z; effect->vel.z = dest.z;
effect->timer_50 = 60; effect->timer_50 = 60;
Audio_PlaySfx(0x31000013U, effect->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000013U, effect->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -1838,7 +1838,7 @@ void func_i4_801912FC(Boss* boss) {
boss->state = 2; boss->state = 2;
Radio_PlayMessage(gMsg_ID_11150, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_11150, RCID_PEPPY);
boss->timer_050 = 1000; boss->timer_050 = 1000;
Audio_PlaySfx(0x19034041U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034041U, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -1880,7 +1880,7 @@ void func_i4_801912FC(Boss* boss) {
boss->swork[boss->dmgPart] -= boss->damage; boss->swork[boss->dmgPart] -= boss->damage;
if (boss->swork[boss->dmgPart] <= 0) { if (boss->swork[boss->dmgPart] <= 0) {
boss->swork[24 + boss->dmgPart] = 30; boss->swork[24 + boss->dmgPart] = 30;
Audio_PlaySfx(0x2903B009U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[36]--; boss->swork[36]--;
if (boss->swork[36] <= 0) { if (boss->swork[36] <= 0) {
boss->state = 10; boss->state = 10;
@ -1891,7 +1891,7 @@ void func_i4_801912FC(Boss* boss) {
boss->obj.pos.y -= 300.0f; boss->obj.pos.y -= 300.0f;
} else { } else {
boss->swork[12 + boss->dmgPart] = 20; boss->swork[12 + boss->dmgPart] = 20;
Audio_PlaySfx(0x29034003U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -2026,7 +2026,7 @@ void func_i4_80191BAC(Boss* boss) {
Math_SmoothStepToF(&gBosses[0].fwork[1], 0.0f, 1.0f, 0.01f, 0.001f); Math_SmoothStepToF(&gBosses[0].fwork[1], 0.0f, 1.0f, 0.01f, 0.001f);
if (boss->timer_052 == 0) { if (boss->timer_052 == 0) {
boss->state = 2; boss->state = 2;
Audio_PlaySfx(0x19401048U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19401048U, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
} }
@ -2097,7 +2097,7 @@ void func_i4_80191ED8(void) {
actor->obj.status = OBJ_INIT; actor->obj.status = OBJ_INIT;
actor->obj.id = D_80178310[i].id; actor->obj.id = D_80178310[i].id;
if ((actor->obj.id == OBJ_ACTOR_271) && (D_8015F924 == 0)) { if ((actor->obj.id == OBJ_ACTOR_271) && (D_8015F924 == 0)) {
Audio_PlaySfx(0x11000028U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000028U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->fwork[10] = actor->obj.pos.x = D_80178310[i].xPos; actor->fwork[10] = actor->obj.pos.x = D_80178310[i].xPos;
actor->fwork[11] = actor->obj.pos.y = D_80178310[i].yPos; actor->fwork[11] = actor->obj.pos.y = D_80178310[i].yPos;

34
src/overlays/ovl_i4/fox_fo.c
View file

@ -54,7 +54,7 @@ void func_i4_801875F0(Actor* actor) {
actorPtr->unk_0C9 = actorPtr->iwork[11] = 1; actorPtr->unk_0C9 = actorPtr->iwork[11] = 1;
actorPtr->unk_044 = 2; actorPtr->unk_044 = 2;
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
Audio_PlaySfx(0x31000011U, actorPtr->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011U, actorPtr->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -85,7 +85,7 @@ void func_i4_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->unk_0F4.x = 0.0f; actor->unk_0F4.x = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x31004005U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31004005U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } }; Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } };
@ -131,7 +131,7 @@ void func_i4_80187960(Actor* actor) {
} }
if (D_8015F928 == 7000) { if (D_8015F928 == 7000) {
Audio_PlaySfx(0x11030016U, gBosses[0].sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030016U, gBosses[0].sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8002EE34(); func_8002EE34();
Radio_PlayMessage(gMsg_ID_9390, RCID_ROB64); Radio_PlayMessage(gMsg_ID_9390, RCID_ROB64);
D_8015F944 = 1.0f; D_8015F944 = 1.0f;
@ -202,7 +202,7 @@ void func_i4_80187960(Actor* actor) {
gPlayer[0].timer_1F8 = 50; gPlayer[0].timer_1F8 = 50;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x101E00FF); func_800182F4(0x101E00FF);
func_800182F4(0x111E00FF); func_800182F4(0x111E00FF);
} else { } else {
@ -491,7 +491,7 @@ void func_i4_80188AD0(Actor* actor) {
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
actor->timer_0CA[0] = 0; actor->timer_0CA[0] = 0;
actor->info.bonus = 0; actor->info.bonus = 0;
Audio_PlaySfx(0x2903B009U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -614,14 +614,14 @@ void func_i4_801890EC(Actor* actor, s32 arg1) {
if (arg1 < 3) { if (arg1 < 3) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
actor->obj.pos.z = -9500.0f; actor->obj.pos.z = -9500.0f;
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->vel.z = 22.0f; actor->vel.z = 22.0f;
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -721,7 +721,7 @@ void func_i4_8018927C(Player* player) {
} }
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -1016,7 +1016,7 @@ void func_i4_8018927C(Player* player) {
D_80177A48[4] = 1.0f; D_80177A48[4] = 1.0f;
actor2->vel.y = 0.1f; actor2->vel.y = 0.1f;
actor1->vel.y = 0.1f; actor1->vel.y = 0.1f;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
@ -1036,7 +1036,7 @@ void func_i4_8018927C(Player* player) {
if (gTeamShields[1] > 0) { if (gTeamShields[1] > 0) {
if (player->timer_1F8 == 980) { if (player->timer_1F8 == 980) {
Audio_PlaySfx(0x09000002U, actor3->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor3->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor3->vel.y = 1.0f; actor3->vel.y = 1.0f;
actor3->fwork[29] = 5.0f; actor3->fwork[29] = 5.0f;
} }
@ -1049,7 +1049,7 @@ void func_i4_8018927C(Player* player) {
} }
if ((gTeamShields[3] > 0) && (player->timer_1F8 == 960)) { if ((gTeamShields[3] > 0) && (player->timer_1F8 == 960)) {
Audio_PlaySfx(0x09000002U, actor2->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor2->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor2->vel.y = 1.0f; actor2->vel.y = 1.0f;
actor2->fwork[29] = 5.0f; actor2->fwork[29] = 5.0f;
} }
@ -1063,7 +1063,7 @@ void func_i4_8018927C(Player* player) {
if (gTeamShields[2] > 0) { if (gTeamShields[2] > 0) {
if (player->timer_1F8 == 940) { if (player->timer_1F8 == 940) {
Audio_PlaySfx(0x09000002U, actor1->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor1->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor1->vel.y = 1.0f; actor1->vel.y = 1.0f;
actor1->fwork[29] = 5.0f; actor1->fwork[29] = 5.0f;
} }
@ -1273,7 +1273,7 @@ void func_i4_8018927C(Player* player) {
case 1240: case 1240:
if (gTeamShields[1] > 0) { if (gTeamShields[1] > 0) {
Audio_PlaySfx(0x09000002U, actor3->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor3->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor3->fwork[29] = 5.0f; actor3->fwork[29] = 5.0f;
actor3->iwork[11] = 2; actor3->iwork[11] = 2;
} }
@ -1281,7 +1281,7 @@ void func_i4_8018927C(Player* player) {
case 1260: case 1260:
if (gTeamShields[2] > 0) { if (gTeamShields[2] > 0) {
Audio_PlaySfx(0x09000002U, actor1->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor1->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor1->fwork[29] = 5.0f; actor1->fwork[29] = 5.0f;
actor1->iwork[11] = 2; actor1->iwork[11] = 2;
} }
@ -1289,7 +1289,7 @@ void func_i4_8018927C(Player* player) {
case 1280: case 1280:
if (gTeamShields[3] > 0) { if (gTeamShields[3] > 0) {
Audio_PlaySfx(0x09000002U, actor2->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor2->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor2->fwork[29] = 5.0f; actor2->fwork[29] = 5.0f;
actor2->iwork[11] = 2; actor2->iwork[11] = 2;
} }
@ -1297,7 +1297,7 @@ void func_i4_8018927C(Player* player) {
break; break;
case 1300: case 1300:
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
break; break;

58
src/overlays/ovl_i4/fox_ka.c
View file

@ -189,7 +189,7 @@ void func_i4_80192C8C(void) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x31000011U, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011U, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -409,7 +409,7 @@ void func_i4_80193718(Boss* boss) {
} }
if (boss->dmgType != DMG_NONE) { if (boss->dmgType != DMG_NONE) {
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007U, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -523,7 +523,7 @@ void func_i4_80193EF0(Boss* boss) {
func_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y - 1200.0f + y, func_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y - 1200.0f + y,
boss->obj.pos.z + dest.z, 1.6f); boss->obj.pos.z + dest.z, 1.6f);
} }
Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
boss->state = 20; boss->state = 20;
boss->timer_050 = 50; boss->timer_050 = 50;
@ -597,7 +597,7 @@ void func_i4_80194458(Boss* boss, Vec3f* pos, f32 arg2) {
actor->timer_0C2 = 30; actor->timer_0C2 = 30;
actor->timer_0C4 = 400; actor->timer_0C4 = 400;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x2903305FU, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903305FU, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->info.action = (ObjectFunc) func_i4_80198AA0; actor->info.action = (ObjectFunc) func_i4_80198AA0;
actor->info.draw = (ObjectFunc) func_i4_801995B4; actor->info.draw = (ObjectFunc) func_i4_801995B4;
break; break;
@ -665,7 +665,7 @@ void func_i4_801946C4(Boss* boss) {
boss->state = 1; boss->state = 1;
boss->vwork[0].y = 2000.0f; boss->vwork[0].y = 2000.0f;
boss->unk_05E = 1; boss->unk_05E = 1;
Audio_PlaySfx(0x11000011U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000011U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i4_801A0548 = 100.0f; D_i4_801A0548 = 100.0f;
D_i4_801A0544 = 100.0f; D_i4_801A0544 = 100.0f;
D_i4_801A0550 = 70.0f; D_i4_801A0550 = 70.0f;
@ -675,7 +675,7 @@ void func_i4_801946C4(Boss* boss) {
boss->fwork[12] = 0.4f; boss->fwork[12] = 0.4f;
boss->fwork[10] = 10.0f; boss->fwork[10] = 10.0f;
Radio_PlayMessage(gMsg_ID_18030, RCID_BILL); Radio_PlayMessage(gMsg_ID_18030, RCID_BILL);
Audio_PlaySfx(0x11037025U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11037025U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -752,7 +752,7 @@ void func_i4_801946C4(Boss* boss) {
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->state++; boss->state++;
boss->timer_050 = 60; boss->timer_050 = 60;
Audio_PlaySfx(0x1903203FU, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903203FU, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[5] = 30.0f; boss->fwork[5] = 30.0f;
boss->fwork[6] = 30.0f; boss->fwork[6] = 30.0f;
boss->fwork[7] = 30.0f; boss->fwork[7] = 30.0f;
@ -765,7 +765,7 @@ void func_i4_801946C4(Boss* boss) {
boss->state++; boss->state++;
boss->timer_050 = 100; boss->timer_050 = 100;
boss->timer_052 = 310; boss->timer_052 = 310;
Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -779,7 +779,7 @@ void func_i4_801946C4(Boss* boss) {
} }
if (boss->timer_052 == 0) { if (boss->timer_052 == 0) {
Audio_PlaySfx(0x19032040U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19032040U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->state++; boss->state++;
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3;
@ -804,7 +804,7 @@ void func_i4_801946C4(Boss* boss) {
case 6: case 6:
if (boss->timer_052 == 1) { if (boss->timer_052 == 1) {
Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
@ -816,7 +816,7 @@ void func_i4_801946C4(Boss* boss) {
if ((en_count < 30) || (boss->timer_056 == 0)) { if ((en_count < 30) || (boss->timer_056 == 0)) {
boss->state = 7; boss->state = 7;
boss->timer_050 = 300; boss->timer_050 = 300;
Audio_PlaySfx(0x1903203FU, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903203FU, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[12] = 0.0f; boss->fwork[12] = 0.0f;
boss->fwork[8] = 30.0f; boss->fwork[8] = 30.0f;
boss->fwork[7] = 30.0f; boss->fwork[7] = 30.0f;
@ -833,7 +833,7 @@ void func_i4_801946C4(Boss* boss) {
} }
if (boss->timer_050 == 240) { if (boss->timer_050 == 240) {
Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
@ -844,14 +844,14 @@ void func_i4_801946C4(Boss* boss) {
boss->fwork[5] = 0.0f; boss->fwork[5] = 0.0f;
boss->timer_056 = 1920; boss->timer_056 = 1920;
boss->timer_052 = 70; boss->timer_052 = 70;
Audio_PlaySfx(0x19032040U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19032040U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 10: case 10:
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->fwork[9] = 200.0f; boss->fwork[9] = 200.0f;
Audio_PlaySfx(0x19032041U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19032041U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001A55C(boss->sfxPos, 0x11037025U); func_8001A55C(boss->sfxPos, 0x11037025U);
boss->state = 11; boss->state = 11;
boss->timer_050 = 100; boss->timer_050 = 100;
@ -866,11 +866,11 @@ void func_i4_801946C4(Boss* boss) {
case 11: case 11:
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034042U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->state = 12; boss->state = 12;
boss->timer_050 = 1928; boss->timer_050 = 1928;
Radio_PlayMessage(gMsg_ID_18055, RCID_BILL); Radio_PlayMessage(gMsg_ID_18055, RCID_BILL);
Audio_PlaySfx(0x11034043U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11034043U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -951,7 +951,7 @@ void func_i4_801946C4(Boss* boss) {
D_i4_801A0558 = 50.0f; D_i4_801A0558 = 50.0f;
D_i4_801A0554 = 50.0f; D_i4_801A0554 = 50.0f;
func_8001A55C(boss->sfxPos, 0x11034043U); func_8001A55C(boss->sfxPos, 0x11034043U);
Audio_PlaySfx(0x19406044U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19406044U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -998,7 +998,7 @@ void func_i4_801946C4(Boss* boss) {
i = gGameFrameCount & 63; i = gGameFrameCount & 63;
Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos); Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos);
func_8007B344(boss->obj.pos.x, boss->obj.pos.y - 600.0f, boss->obj.pos.z, 90.0f, 0); func_8007B344(boss->obj.pos.x, boss->obj.pos.y - 600.0f, boss->obj.pos.z, 90.0f, 0);
Audio_PlaySfx(0x1140B045U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1140B045U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_052 == 690) { if (boss->timer_052 == 690) {
@ -1031,7 +1031,7 @@ void func_i4_801946C4(Boss* boss) {
gBosses[0].state = 1; gBosses[0].state = 1;
boss->state = 18; boss->state = 18;
boss->timer_050 = 50; boss->timer_050 = 50;
Audio_PlaySfx(0x11038046U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11038046U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
@ -1081,7 +1081,7 @@ void func_i4_801946C4(Boss* boss) {
boss->obj.rot.y = 30.0f; boss->obj.rot.y = 30.0f;
boss->obj.pos.x = -4000.0f; boss->obj.pos.x = -4000.0f;
boss->unk_078.z = 7.0f; boss->unk_078.z = 7.0f;
Audio_PlaySfx(0x11404016U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11404016U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 0; i < ARRAY_COUNT(gEffects); i++) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos); Object_Kill(&gEffects[i].obj, gEffects[i].sfxPos);
} }
@ -1093,7 +1093,7 @@ void func_i4_801946C4(Boss* boss) {
Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1);
boss->obj.pos.z += boss->unk_078.z; boss->obj.pos.z += boss->unk_078.z;
if (boss->timer_050 == 820) { if (boss->timer_050 == 820) {
Audio_PlaySfx(0x19408047U, boss->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19408047U, boss->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 >= 821) { if (boss->timer_050 >= 821) {
@ -1343,7 +1343,7 @@ void func_i4_80196E30(Actor* actor, s32 idx) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_80196F40(Actor* actor, s32 idx) { void func_i4_80196F40(Actor* actor, s32 idx) {
@ -1361,7 +1361,7 @@ void func_i4_80196F40(Actor* actor, s32 idx) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_80197024(void) { void func_i4_80197024(void) {
@ -1395,7 +1395,7 @@ void func_i4_80197024(void) {
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1574,7 +1574,7 @@ void func_i4_80197290(Player* player) {
break; break;
case 1010: case 1010:
Audio_PlaySfx(0x09000002U, &player->sfxPos[0], 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, &player->sfxPos[0], 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
@ -1688,7 +1688,7 @@ void func_i4_80197F10(Actor* actor) {
case 2: case 2:
actor->state = 3; actor->state = 3;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
case 3: case 3:
@ -1770,7 +1770,7 @@ void func_i4_801981F8(Actor* actor) {
if (actor_it->unk_0B6 == 1) { if (actor_it->unk_0B6 == 1) {
actor_it->info.unk_1C = 0.0f; actor_it->info.unk_1C = 0.0f;
actor_it->info.bonus = 0; actor_it->info.bonus = 0;
Audio_PlaySfx(0x3100000C, actor_it->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor_it->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor_it->info.action = (ObjectFunc) func_i4_80198AA0; actor_it->info.action = (ObjectFunc) func_i4_80198AA0;
actor_it->info.draw = (ObjectFunc) func_i4_801995B4; actor_it->info.draw = (ObjectFunc) func_i4_801995B4;
@ -1801,7 +1801,7 @@ void func_i4_8019848C(void) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
actor->info.bonus = 0; actor->info.bonus = 0;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_80198594(Actor* actor) { void func_i4_80198594(Actor* actor) {
@ -1820,7 +1820,7 @@ void func_i4_80198594(Actor* actor) {
gBosses[1].obj.pos.x = 0.0f; gBosses[1].obj.pos.x = 0.0f;
gBosses[1].obj.pos.z = 0.0f; gBosses[1].obj.pos.z = 0.0f;
gBosses[1].obj.pos.y = 2000.0f; gBosses[1].obj.pos.y = 2000.0f;
Audio_PlaySfx(0x11037025U, gBosses[1].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11037025U, gBosses[1].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_8015F928 = 20000; D_8015F928 = 20000;
gBosses[1].swork[16] = 5760; gBosses[1].swork[16] = 5760;
D_8015F920 = 1; D_8015F920 = 1;

50
src/overlays/ovl_i4/fox_sz.c
View file

@ -46,8 +46,8 @@ void func_i4_80199900(Actor* actor, s32 arg1) {
gPlayer[0].unk_1D0 = 1000; gPlayer[0].unk_1D0 = 1000;
gActors[0].state = 6; gActors[0].state = 6;
gPlayer[0].timer_1F8 = 30; gPlayer[0].timer_1F8 = 30;
Audio_PlaySfx(0x11030010U, gActors[0].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, gActors[0].sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, gActors[0].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, gActors[0].sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
} }
@ -191,7 +191,7 @@ void func_i4_80199FCC(Actor* actor, s32 arg1) {
actor->fwork[1] = 25.0f; actor->fwork[1] = 25.0f;
actor->fwork[29] = 2.0f; actor->fwork[29] = 2.0f;
Audio_PlaySfx(0x3103A061U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3103A061U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_8019A0F8(Actor* actor, s32 arg1) { void func_i4_8019A0F8(Actor* actor, s32 arg1) {
@ -238,7 +238,7 @@ void func_i4_8019A1D0(void) {
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_8019A2F4(Actor* actor) { void func_i4_8019A2F4(Actor* actor) {
@ -377,7 +377,7 @@ void func_i4_8019A3E8(Actor* actor) {
actorPtr->unk_044 = 2; actorPtr->unk_044 = 2;
actorPtr->timer_0C2 = 30; actorPtr->timer_0C2 = 30;
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
Audio_PlaySfx(0x31000011U, actorPtr->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011U, actorPtr->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_04E++; actor->unk_04E++;
break; break;
} }
@ -571,7 +571,7 @@ void func_i4_8019AB8C(Actor* actor) {
D_80178340 = D_80178358 = 0; D_80178340 = D_80178358 = 0;
switch (actor->timer_0BC) { switch (actor->timer_0BC) {
case 9800: case 9800:
Audio_PlaySfx(0x09000002U, gActors[10].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, gActors[10].sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gActors[10].fwork[29] = 12.0f; gActors[10].fwork[29] = 12.0f;
break; break;
@ -679,7 +679,7 @@ void func_i4_8019B568(void) {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->vel.x = -20.0f; actor->vel.x = -20.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Vec3f D_i4_8019F57C[] = { Vec3f D_i4_8019F57C[] = {
{ 150.0f, 150.0f, 50.0f }, { -150.0f, -150.0f, 50.0f }, { -150.0f, 150.0f, 50.0f }, { 150.0f, -150.0f, 50.0f } { 150.0f, 150.0f, 50.0f }, { -150.0f, -150.0f, 50.0f }, { -150.0f, 150.0f, 50.0f }, { 150.0f, -150.0f, 50.0f }
@ -706,7 +706,7 @@ void func_i4_8019B630(Actor* actor, s32 index) {
actor->unk_0B6 = 26; actor->unk_0B6 = 26;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Vec3f D_i4_8019F5BC[] = { Vec3f D_i4_8019F5BC[] = {
@ -729,8 +729,8 @@ void func_i4_8019B75C(Actor* actor, s32 arg1) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
@ -759,7 +759,7 @@ void func_i4_8019B888(void) {
actor->unk_0F4.y = 270.0f; actor->unk_0F4.y = 270.0f;
actor->health = 255; actor->health = 255;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C);
actor->info.unk_16 = 0; actor->info.unk_16 = 0;
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
@ -931,7 +931,7 @@ void func_i4_8019BA64(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 20: case 20:
Audio_PlaySfx(0x49000014U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000014U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 330: case 330:
@ -985,7 +985,7 @@ void func_i4_8019BA64(Player* player) {
player->unk_114 = 90.0f; player->unk_114 = 90.0f;
player->unk_0D0 = D_80161A54; player->unk_0D0 = D_80161A54;
player->unk_234 = 1; player->unk_234 = 1;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
@ -1045,13 +1045,13 @@ void func_i4_8019C574(Actor* actor, s32 index) {
if (index < 3) { if (index < 3) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->fwork[0] = 20.0f; actor->fwork[0] = 20.0f;
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1081,7 +1081,7 @@ void func_i4_8019C70C(void) {
actor->timer_0BC = 130; actor->timer_0BC = 130;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i4_8019C85C(Player* player) { void func_i4_8019C85C(Player* player) {
@ -1109,7 +1109,7 @@ void func_i4_8019C85C(Player* player) {
if (player->timer_1F8 == 0) { if (player->timer_1F8 == 0) {
player->unk_1D0 = 1001; player->unk_1D0 = 1001;
player->timer_1F8 = 100; player->timer_1F8 = 100;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
D_80161A44 = 30000.0f; D_80161A44 = 30000.0f;
@ -1179,7 +1179,7 @@ void func_i4_8019C85C(Player* player) {
for (i = 0; i < ARRAY_COUNT(gActors); i++) { for (i = 0; i < ARRAY_COUNT(gActors); i++) {
Object_Kill(&gActors[i].obj, gActors[i].sfxPos); Object_Kill(&gActors[i].obj, gActors[i].sfxPos);
} }
Audio_PlaySfx(0x31024059U, boss0->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059U, boss0->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1: case 1:
@ -1506,7 +1506,7 @@ void func_i4_8019C85C(Player* player) {
break; break;
case 2510: case 2510:
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
@ -1570,7 +1570,7 @@ void func_i4_8019DD20(Actor* actor) {
switch (actor->state) { switch (actor->state) {
case 1: case 1:
actor->state = 2; actor->state = 2;
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
case 2: case 2:
@ -1612,7 +1612,7 @@ void func_i4_8019DD20(Actor* actor) {
break; break;
case 430: case 430:
Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 8.0f; actor->fwork[29] = 8.0f;
break; break;
@ -1671,7 +1671,7 @@ void func_i4_8019E234(Actor* actor) {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->health -= actor->damage; actor->health -= actor->damage;
Audio_PlaySfx(0x2903300EU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300EU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->health <= 0) { if (actor->health <= 0) {
func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10);
func_80066254(actor); func_80066254(actor);
@ -1714,7 +1714,7 @@ void func_i4_8019E454(Boss* boss) {
boss->timer_050 = 10; boss->timer_050 = 10;
boss->timer_052 = 60; boss->timer_052 = 60;
boss->state = 1; boss->state = 1;
Audio_PlaySfx(0x1900404FU, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900404FU, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
@ -1847,5 +1847,5 @@ void func_i4_8019EA68(void) {
boss->obj.id = OBJ_BOSS_313; boss->obj.id = OBJ_BOSS_313;
Object_SetInfo(&boss->info, boss->obj.id); Object_SetInfo(&boss->info, boss->obj.id);
Audio_PlaySfx(0x11030010U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, boss->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }

178
src/overlays/ovl_i5/fox_ma.c
View file

@ -559,7 +559,7 @@ void func_i5_8019A2F4(Actor* actor) {
} }
D_i5_801BE2F0[0] = var_a0; D_i5_801BE2F0[0] = var_a0;
if (D_i5_801BA1E4 != D_i5_801BA1EC[var_a0 - 1].unk_04) { if (D_i5_801BA1E4 != D_i5_801BA1EC[var_a0 - 1].unk_04) {
Audio_PlaySfx(0x1940205E, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940205E, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_i5_801BA1E4 = D_i5_801BA1EC[var_a0 - 1].unk_04; D_i5_801BA1E4 = D_i5_801BA1EC[var_a0 - 1].unk_04;
var_fa1 = D_i5_801BA1EC[var_a0 - 1].unk_08; var_fa1 = D_i5_801BA1EC[var_a0 - 1].unk_08;
@ -676,7 +676,7 @@ void func_i5_8019A8C8(Actor* actor, s16 arg1) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f);
} }
Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_8019AF34(Actor* actor) { void func_i5_8019AF34(Actor* actor) {
@ -705,7 +705,7 @@ void func_i5_8019AF34(Actor* actor) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, RAND_FLOAT(0.8f) + 0.3f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, RAND_FLOAT(0.8f) + 0.3f);
} }
Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_8019B580(Actor* actor, s32* arg1) { void func_i5_8019B580(Actor* actor, s32* arg1) {
@ -813,7 +813,7 @@ bool func_i5_8019C4EC(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if (actor->unk_0D2 == 1) { if (actor->unk_0D2 == 1) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->iwork[7] = 15; actor->iwork[7] = 15;
D_i5_801BE320[22] = 0; D_i5_801BE320[22] = 0;
@ -821,7 +821,7 @@ bool func_i5_8019C4EC(Actor* actor) {
D_i5_801BE320[21] = 2; D_i5_801BE320[21] = 2;
return true; return true;
} }
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
return false; return false;
@ -891,7 +891,7 @@ void func_i5_8019C778(Actor* actor) {
break; break;
case 1: case 1:
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
Audio_PlaySfx(0x1900000D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BC <= 0) { if (actor->timer_0BC <= 0) {
Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f);
@ -903,7 +903,7 @@ void func_i5_8019C778(Actor* actor) {
actor->timer_0BC = 200; actor->timer_0BC = 200;
D_i5_801BE320[19] = 0; D_i5_801BE320[19] = 0;
actor->state++; actor->state++;
Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -912,7 +912,7 @@ void func_i5_8019C778(Actor* actor) {
if ((actor->timer_0BC <= 0) && (D_i5_801BE320[25] == 1)) { if ((actor->timer_0BC <= 0) && (D_i5_801BE320[25] == 1)) {
actor->timer_0BC = 60; actor->timer_0BC = 60;
actor->state++; actor->state++;
Audio_PlaySfx(0x1900000D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 3: case 3:
@ -925,7 +925,7 @@ void func_i5_8019C778(Actor* actor) {
D_i5_801BE320[30] = 0; D_i5_801BE320[30] = 0;
D_i5_801BE320[25] = 0; D_i5_801BE320[25] = 0;
} }
Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BC <= 0) { if (actor->timer_0BC <= 0) {
D_i5_801BE320[30]++; D_i5_801BE320[30]++;
@ -935,7 +935,7 @@ void func_i5_8019C778(Actor* actor) {
} }
actor->timer_0BC = 100; actor->timer_0BC = 100;
actor->state--; actor->state--;
Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900000E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BC == 30) { if (actor->timer_0BC == 30) {
func_i5_8019C5B8(actor); func_i5_8019C5B8(actor);
@ -981,7 +981,7 @@ void func_i5_8019C778(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (D_i5_801BE320[4] > 0) { if (D_i5_801BE320[4] > 0) {
@ -1204,7 +1204,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) ||
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 20); actor->vel.y, actor->vel.z, 0.15f, 20);
@ -1217,7 +1217,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) { } else if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 1: case 1:
@ -1232,7 +1232,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, (RAND_FLOAT(0.8f) + 0.3f) * 2.0f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, (RAND_FLOAT(0.8f) + 0.3f) * 2.0f);
} }
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
*arg7 = 1; *arg7 = 1;
*arg2 = 20; *arg2 = 20;
(*arg1)++; (*arg1)++;
@ -1242,7 +1242,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5])) || (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5])) ||
((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) { ((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 0x14); actor->vel.y, actor->vel.z, 0.15f, 0x14);
@ -1257,7 +1257,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) { } else if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 3: case 3:
@ -1273,7 +1273,7 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
(s32) (RAND_FLOAT(50.0f) + 70.0f), 2, (RAND_FLOAT(0.8f) + 0.3f) * 1.5f); (s32) (RAND_FLOAT(50.0f) + 70.0f), 2, (RAND_FLOAT(0.8f) + 0.3f) * 1.5f);
} }
} }
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
*arg7 = 2; *arg7 = 2;
var_v0 = arg3; var_v0 = arg3;
if (var_v0 == 3) { if (var_v0 == 3) {
@ -1367,7 +1367,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) ||
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1380,7 +1380,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if (actor->unk_0D0 != 0) { } else if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_i5_8019B580(actor, arg2); func_i5_8019B580(actor, arg2);
break; break;
@ -1394,7 +1394,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) ||
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x,
actor->vel.y, actor->vel.z, 0.2f, 10); actor->vel.y, actor->vel.z, 0.2f, 10);
@ -1409,7 +1409,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} else { } else {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1473,7 +1473,7 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) ||
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1487,7 +1487,7 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if (actor->unk_0D0 != 0) { } else if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_i5_8019B580(actor, arg2); func_i5_8019B580(actor, arg2);
return; return;
@ -1632,7 +1632,7 @@ void func_i5_8019F164(Actor* actor) {
if (sp44 != 0) { if (sp44 != 0) {
sp60.x -= 60.0f; sp60.x -= 60.0f;
func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[4]++; actor->iwork[4]++;
} else if ((D_i5_801BE310 == actor->iwork[5]) || } else if ((D_i5_801BE310 == actor->iwork[5]) ||
((gPlayer[0].pos.x - actor->obj.pos.x > 300.0f) && ((gPlayer[0].pos.x - actor->obj.pos.x > 300.0f) &&
@ -1644,7 +1644,7 @@ void func_i5_8019F164(Actor* actor) {
(actor->health != 0)) { (actor->health != 0)) {
sp60.x -= 60.0f; sp60.x -= 60.0f;
func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[4]++; actor->iwork[4]++;
} }
} }
@ -1667,7 +1667,7 @@ void func_i5_8019F164(Actor* actor) {
case 3: case 3:
if ((actor->timer_0BC == 0) && (actor->health != 0)) { if ((actor->timer_0BC == 0) && (actor->health != 0)) {
func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[4]++; actor->iwork[4]++;
} }
break; break;
@ -1690,7 +1690,7 @@ void func_i5_8019F164(Actor* actor) {
if ((actor->timer_0BC == 0) && (actor->health != 0)) { if ((actor->timer_0BC == 0) && (actor->health != 0)) {
sp60.x += 60.0f; sp60.x += 60.0f;
func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903101B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[4]++; actor->iwork[4]++;
} }
break; break;
@ -1720,7 +1720,7 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3
if (((actor->unk_0D0 != 0) && (actor->unk_0D2 >= arg3) && (arg4 >= actor->unk_0D2)) || if (((actor->unk_0D0 != 0) && (actor->unk_0D2 >= arg3) && (arg4 >= actor->unk_0D2)) ||
((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) ||
(((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
func_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6, actor->vel.x, func_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1737,7 +1737,7 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3
} }
} else if (actor->unk_0D0 != 0) { } else if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_i5_8019B580(actor, arg2); func_i5_8019B580(actor, arg2);
break; break;
@ -2024,12 +2024,12 @@ void func_i5_801A0BD8(Object_80* obj80) {
break; break;
case 1: case 1:
if (obj80->timer_4C == 1) { if (obj80->timer_4C == 1) {
Audio_PlaySfx(0x01004024, gPlayer[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01004024, gPlayer[0].sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (obj80->timer_4C <= 0) { if (obj80->timer_4C <= 0) {
Math_SmoothStepToF(&obj80->vel.x, 1751.0f, 0.2f, 80.0f, 1.0f); Math_SmoothStepToF(&obj80->vel.x, 1751.0f, 0.2f, 80.0f, 1.0f);
if (obj80->vel.x >= 1750.0) { if (obj80->vel.x >= 1750.0) {
Audio_PlaySfx(0x1940807B, obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940807B, obj80->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001A55C(gPlayer[0].sfxPos, 0x01004024); func_8001A55C(gPlayer[0].sfxPos, 0x01004024);
obj80->timer_4C = 5; obj80->timer_4C = 5;
obj80->state = 2; obj80->state = 2;
@ -2856,14 +2856,14 @@ void func_i5_801A3E98(Actor* actor) {
case 0: case 0:
if ((actor->unk_0D0 != 0) && (actor->unk_0D0 != 3)) { if ((actor->unk_0D0 != 0) && (actor->unk_0D0 != 3)) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x1903205F, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1903205F, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state = 1; actor->state = 1;
} }
break; break;
case 1: case 1:
Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f);
if (actor->fwork[1] <= -180.0f) { if (actor->fwork[1] <= -180.0f) {
Audio_PlaySfx(0x19033008, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19033008, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603648C); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603648C);
actor->iwork[0] = 2; actor->iwork[0] = 2;
actor->state = 2; actor->state = 2;
@ -2884,16 +2884,16 @@ void func_i5_801A3E98(Actor* actor) {
break; break;
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
} }
Math_SmoothStepToF(actor->fwork, 30.0f, 0.4f, 10.0f, 0.0f); Math_SmoothStepToF(actor->fwork, 30.0f, 0.4f, 10.0f, 0.0f);
Math_SmoothStepToF(&actor->fwork[4], 30.0f, 0.4f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->fwork[4], 30.0f, 0.4f, 10.0f, 0.0f);
if (actor->fwork[0] < 31.0f) { if (actor->fwork[0] < 31.0f) {
if (actor->state >= 3) { if (actor->state >= 3) {
Audio_PlaySfx(0x19020060, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19020060, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19020061, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19020061, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->fwork[0] = 255.0f; actor->fwork[0] = 255.0f;
actor->fwork[4] = 170.0f; actor->fwork[4] = 170.0f;
@ -2967,7 +2967,7 @@ void func_i5_801A46A0(Actor* actor) {
Math_SmoothStepToF(&actor->gravity, 5.0f, 0.08f, 1.0f, 0.0f); Math_SmoothStepToF(&actor->gravity, 5.0f, 0.08f, 1.0f, 0.0f);
if (actor->obj.pos.y < 80.0f) { if (actor->obj.pos.y < 80.0f) {
if (actor->unk_046 != 0) { if (actor->unk_046 != 0) {
Audio_PlaySfx(0x19030006, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030006, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->obj.pos.y = 80.0f; actor->obj.pos.y = 80.0f;
if (actor->vel.y < 0) { if (actor->vel.y < 0) {
actor->vel.y = -actor->vel.y * (actor->unk_046 * 0.07f); actor->vel.y = -actor->vel.y * (actor->unk_046 * 0.07f);
@ -3018,7 +3018,7 @@ void func_i5_801A46A0(Actor* actor) {
void func_i5_801A49B8(Actor* actor) { void func_i5_801A49B8(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
Audio_PlaySfx(0x29024003, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29024003, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
if (actor->health <= 0) { if (actor->health <= 0) {
@ -3124,7 +3124,7 @@ void func_i5_801A4B24(Actor* actor) {
break; break;
case 6: case 6:
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
Audio_PlaySfx(0x1940405D, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940405D, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
Math_SmoothStepToF(&actor->fwork[7], -41.0f, 0.2f, 5.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[7], -41.0f, 0.2f, 5.0f, 0.01f);
@ -3143,7 +3143,7 @@ void func_i5_801A4B24(Actor* actor) {
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(actor->fwork, 30, 0.4f, actor->fwork[1], 0.0f); Math_SmoothStepToF(actor->fwork, 30, 0.4f, actor->fwork[1], 0.0f);
Math_SmoothStepToF(&actor->fwork[4], 30, 0.4f, actor->fwork[1], 0.0f); Math_SmoothStepToF(&actor->fwork[4], 30, 0.4f, actor->fwork[1], 0.0f);
@ -3263,7 +3263,7 @@ void func_i5_801A57D0(Effect* effect) {
effect->vel.x = sp44.x; effect->vel.x = sp44.x;
effect->vel.y = sp44.y; effect->vel.y = sp44.y;
effect->vel.z = sp44.z; effect->vel.z = sp44.z;
Audio_PlaySfx(0x09007011, effect->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09007011, effect->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].unk_280 == 0) && (gPlayer[0].timer_498 == 0)) {
Player_ApplyDamage(&gPlayer[0], 0, effect->info.damage); Player_ApplyDamage(&gPlayer[0], 0, effect->info.damage);
@ -3353,14 +3353,14 @@ void func_i5_801A5E54(Actor* actor) {
} }
if ((D_i5_801BA1E0 - actor->obj.pos.z) < -800.0f) { if ((D_i5_801BA1E0 - actor->obj.pos.z) < -800.0f) {
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
Audio_PlaySfx(0x11001063, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11001063, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[0]++; actor->iwork[0]++;
} }
Math_SmoothStepToF(&actor->obj.pos.x, actor->fwork[0] + (actor->fwork[2] * 400.0f), 0.1f, 4.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.x, actor->fwork[0] + (actor->fwork[2] * 400.0f), 0.1f, 4.0f, 0.01f);
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -3377,14 +3377,14 @@ void func_i5_801A5FD0(Actor* actor) {
} }
if (gPlayer[0].unk_138 - actor->obj.pos.z < actor->fwork[2]) { if (gPlayer[0].unk_138 - actor->obj.pos.z < actor->fwork[2]) {
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
Audio_PlaySfx(0x19001062, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19001062, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[0] += 1; actor->iwork[0] += 1;
} }
Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[1] + 356.0f, 0.4f, 20.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[1] + 356.0f, 0.4f, 20.0f, 0.01f);
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -3408,14 +3408,14 @@ void func_i5_801A6144(Actor* actor) {
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.15f, 20); actor->vel.z, 0.15f, 20);
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
if ((gPlayer[0].unk_138 - 20.0f) < actor->obj.pos.z) { if ((gPlayer[0].unk_138 - 20.0f) < actor->obj.pos.z) {
actor->health = 0; actor->health = 0;
} }
if (actor->health <= 0) { if (actor->health <= 0) {
Audio_PlaySfx(0x2903B009, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
14.0f, 5); 14.0f, 5);
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
@ -3989,7 +3989,8 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE320[2] = 5; D_i5_801BE320[2] = 5;
D_i5_801BE320[31] = 30; D_i5_801BE320[31] = 30;
actor->timer_0BC = 100; actor->timer_0BC = 100;
Audio_PlaySfx(0x19022067, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19022067, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
actor->state = 12; actor->state = 12;
} }
} else if ((D_i5_801BE320[26] != 0) && (D_i5_801BE320[10] > 0)) { } else if ((D_i5_801BE320[26] != 0) && (D_i5_801BE320[10] > 0)) {
@ -4059,7 +4060,7 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1);
if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) { if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036818); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036818);
Audio_PlaySfx(0x2902405E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902405E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34);
@ -4107,7 +4108,7 @@ void func_i5_801A7E7C(Actor* actor) {
case 8: case 8:
func_i5_8019A198(actor); func_i5_8019A198(actor);
if (!(gGameFrameCount & 0xF)) { if (!(gGameFrameCount & 0xF)) {
Audio_PlaySfx(0x29036099, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29036099, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
func_i5_801A74C4(actor); func_i5_801A74C4(actor);
func_i5_801A6984(actor); func_i5_801A6984(actor);
@ -4138,7 +4139,7 @@ void func_i5_801A7E7C(Actor* actor) {
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255;
Audio_PlaySfx(0x2940D09A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Radio_PlayMessage(gMsg_ID_17450, RCID_BOSS_MACBETH); Radio_PlayMessage(gMsg_ID_17450, RCID_BOSS_MACBETH);
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
func_i5_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, func_i5_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z,
@ -4156,9 +4157,9 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE368[13] = 30.0f; D_i5_801BE368[13] = 30.0f;
if (D_i5_801BE320[29] > 0) { if (D_i5_801BE320[29] > 0) {
if (D_i5_801BE320[29] > 100) { if (D_i5_801BE320[29] > 100) {
Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2943500F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -4349,7 +4350,7 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE320[5] = 0; D_i5_801BE320[5] = 0;
D_i5_801BE320[7] = 0; D_i5_801BE320[7] = 0;
if (actor->timer_0BC == 60) { if (actor->timer_0BC == 60) {
Audio_PlaySfx(0x19023068, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19023068, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_i5_801BE320[24] = 0; D_i5_801BE320[24] = 0;
spC6 = RAND_INT(5.0f); spC6 = RAND_INT(5.0f);
@ -4406,7 +4407,7 @@ void func_i5_801A7E7C(Actor* actor) {
func_i5_801A6984(actor); func_i5_801A6984(actor);
if (actor->timer_0BC < 100) { if (actor->timer_0BC < 100) {
if (actor->timer_0BC == 98) { if (actor->timer_0BC == 98) {
Audio_PlaySfx(0x19022069, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19022069, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Matrix_RotateY(gCalcMatrix, RAND_FLOAT(2.0f) * (M_DTOR * 180.0f), 0); Matrix_RotateY(gCalcMatrix, RAND_FLOAT(2.0f) * (M_DTOR * 180.0f), 0);
sp360.x = 0.0f; sp360.x = 0.0f;
@ -4456,9 +4457,9 @@ void func_i5_801A7E7C(Actor* actor) {
if (actor->timer_0BC < (D_i5_801BE320[27] - 40)) { if (actor->timer_0BC < (D_i5_801BE320[27] - 40)) {
if ((actor->timer_0BC + 42) == D_i5_801BE320[27]) { if ((actor->timer_0BC + 42) == D_i5_801BE320[27]) {
actor->sfxPos[0] = actor->vwork[2].x; actor->sfxPos[0] = actor->vwork[2].x;
Audio_PlaySfx(0x19006035, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19006035, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->sfxPos[0] = actor->vwork[4].x; actor->sfxPos[0] = actor->vwork[4].x;
Audio_PlaySfx(0x19006035, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19006035, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->sfxPos[0] = actor->obj.pos.x; actor->sfxPos[0] = actor->obj.pos.x;
} }
if (!(gGameFrameCount & 1) && (D_i5_801BE320[15] == 0)) { if (!(gGameFrameCount & 1) && (D_i5_801BE320[15] == 0)) {
@ -4596,7 +4597,7 @@ void func_i5_801A7E7C(Actor* actor) {
RAND_FLOAT_CENTERED(10.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 11, 1.0f); RAND_FLOAT_CENTERED(10.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 11, 1.0f);
D_80137E84[gMainController] = 1; D_80137E84[gMainController] = 1;
D_Timer_80177BD0[gMainController] = 15; D_Timer_80177BD0[gMainController] = 15;
Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->state = 21; actor->state = 21;
} }
break; break;
@ -4609,7 +4610,7 @@ void func_i5_801A7E7C(Actor* actor) {
if ((actor->unk_0D0 != 0) && (actor->state >= 2)) { if ((actor->unk_0D0 != 0) && (actor->state >= 2)) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if ((actor->unk_0D2 == 0) && (D_i5_801BE320[9] > 0) && ((gPlayer[0].unk_138 - actor->obj.pos.z) > 200.0f)) { if ((actor->unk_0D2 == 0) && (D_i5_801BE320[9] > 0) && ((gPlayer[0].unk_138 - actor->obj.pos.z) > 200.0f)) {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[7] = 15; actor->iwork[7] = 15;
D_i5_801BE320[9] -= actor->damage; D_i5_801BE320[9] -= actor->damage;
func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f, func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f,
@ -4618,7 +4619,7 @@ void func_i5_801A7E7C(Actor* actor) {
RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f),
3, RAND_FLOAT(1.0f)); 3, RAND_FLOAT(1.0f));
if (D_i5_801BE320[9] <= 0) { if (D_i5_801BE320[9] <= 0) {
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f,
@ -4635,7 +4636,7 @@ void func_i5_801A7E7C(Actor* actor) {
} }
} else if ((actor->unk_0D2 == 1) && (D_i5_801BE320[10] > 0) && } else if ((actor->unk_0D2 == 1) && (D_i5_801BE320[10] > 0) &&
((gPlayer[0].unk_138 - actor->obj.pos.z) > 200.0f)) { ((gPlayer[0].unk_138 - actor->obj.pos.z) > 200.0f)) {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->iwork[8] = 16; actor->iwork[8] = 16;
D_i5_801BE320[10] -= actor->damage; D_i5_801BE320[10] -= actor->damage;
func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f),
@ -4643,7 +4644,7 @@ void func_i5_801A7E7C(Actor* actor) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f));
if (D_i5_801BE320[10] <= 0) { if (D_i5_801BE320[10] <= 0) {
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f); func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f);
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
@ -4660,7 +4661,7 @@ void func_i5_801A7E7C(Actor* actor) {
(s32) (RAND_FLOAT(50.0f) + 70.0f), 9, 1.0f); (s32) (RAND_FLOAT(50.0f) + 70.0f), 9, 1.0f);
} }
} else { } else {
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (D_i5_801BE320[4] != 0) { if (D_i5_801BE320[4] != 0) {
@ -4941,7 +4942,7 @@ void func_i5_801AC438(Actor* actor) {
func_i5_8019A728(actor); func_i5_8019A728(actor);
if (actor->iwork[1] != 0) { if (actor->iwork[1] != 0) {
Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH); Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH);
Audio_PlaySfx(0x19034066, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19034066, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035A94); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035A94);
actor->state += 1; actor->state += 1;
} }
@ -4956,7 +4957,7 @@ void func_i5_801AC438(Actor* actor) {
} }
if (actor->unk_0D0 != 0) { if (actor->unk_0D0 != 0) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -4984,7 +4985,7 @@ void func_i5_801AC6B4(Actor* actor) {
actor->obj.pos.z = 0.0f; actor->obj.pos.z = 0.0f;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} }
@ -5292,7 +5293,7 @@ void func_i5_801AD6F0(Actor* actor) {
actor->unk_046 = 192; actor->unk_046 = 192;
actor->scale = 2.5f; actor->scale = 2.5f;
actor->fwork[0] = 2.5f; actor->fwork[0] = 2.5f;
Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f); func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f);
func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5); func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5);
if (actor->obj.pos.y < (gGroundLevel + 10.0f)) { if (actor->obj.pos.y < (gGroundLevel + 10.0f)) {
@ -5361,7 +5362,7 @@ void func_i5_801ADC08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
actor->vel.z = zVel; actor->vel.z = zVel;
actor->timer_0BC = 0; actor->timer_0BC = 0;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void func_i5_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -5419,7 +5420,7 @@ void func_i5_801ADD68(Actor* actor) {
} }
if ((func_8006351C(actor->index, &actor->obj.pos, &sp3C, 1) != 0) || if ((func_8006351C(actor->index, &actor->obj.pos, &sp3C, 1) != 0) ||
(actor->obj.pos.y < (gGroundLevel + 200.0f))) { (actor->obj.pos.y < (gGroundLevel + 200.0f))) {
Audio_PlaySfx(0x19032064, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19032064, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80137E84[gMainController] = 1; D_80137E84[gMainController] = 1;
D_Timer_80177BD0[gMainController] = 5; D_Timer_80177BD0[gMainController] = 5;
actor->vel.x = 0.0f; actor->vel.x = 0.0f;
@ -5461,7 +5462,7 @@ void func_i5_801ADD68(Actor* actor) {
actor->obj.pos.z, 7.0f); actor->obj.pos.z, 7.0f);
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
} else { } else {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -5523,7 +5524,7 @@ void func_i5_801AE4CC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32
} }
actor->health = 30; actor->health = 30;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) { void func_i5_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) {
@ -5657,7 +5658,7 @@ void func_i5_801AEC04(Actor* actor) {
} }
actor->state = 1; actor->state = 1;
actor->timer_0BC = 200; actor->timer_0BC = 200;
Audio_PlaySfx(0x11000028, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000028, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 1: case 1:
@ -5686,7 +5687,7 @@ void func_i5_801AEC04(Actor* actor) {
actor->fwork[1] = 32.0f; actor->fwork[1] = 32.0f;
} }
if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) { if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
@ -5726,7 +5727,7 @@ void func_i5_801AF134(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
actor->fwork[0] = 1.0f; actor->fwork[0] = 1.0f;
actor->fwork[2] = 1.0f; actor->fwork[2] = 1.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900201D, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void func_i5_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -5769,12 +5770,12 @@ void func_i5_801AF27C(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801BA820[arg1]; actor->fwork[3] = D_i5_801BA820[arg1];
actor->state = 30; actor->state = 30;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 21; actor->state = 21;
actor->obj.rot.z = 32.5f; actor->obj.rot.z = 32.5f;
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
} }
@ -5806,7 +5807,7 @@ void func_i5_801AF44C(void) {
actor->state = 15; actor->state = 15;
actor->fwork[3] = D_i5_801BA820[4]; actor->fwork[3] = D_i5_801BA820[4];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
static Vec3f D_i5_801BA834[2] = { static Vec3f D_i5_801BA834[2] = {
@ -6028,7 +6029,8 @@ void func_i5_801AF8F4(Player* player) {
player->unk_114 = 0.0f; player->unk_114 = 0.0f;
D_i5_801BA1DC = -100.0f; D_i5_801BA1DC = -100.0f;
func_8001A838(0x31078085); func_8001A838(0x31078085);
Audio_PlaySfx(0x31408095, gActors[D_i5_801BE314].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31408095, gActors[D_i5_801BE314].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
D_i5_801BE313 = 0; D_i5_801BE313 = 0;
} }
break; break;
@ -6119,7 +6121,8 @@ void func_i5_801AF8F4(Player* player) {
D_80177CE8 += player->unk_140; D_80177CE8 += player->unk_140;
if (gCsFrameCount == 630) { if (gCsFrameCount == 630) {
func_8001A55C(gActors[D_i5_801BE314].sfxPos, 0x31408095); func_8001A55C(gActors[D_i5_801BE314].sfxPos, 0x31408095);
Audio_PlaySfx(0x2940C00A, gActors[D_i5_801BE314].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, gActors[D_i5_801BE314].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
player->unk_1D0++; player->unk_1D0++;
player->vel.z = 0.0f; player->vel.z = 0.0f;
player->unk_140 = 0.0f; player->unk_140 = 0.0f;
@ -6258,7 +6261,8 @@ void func_i5_801AF8F4(Player* player) {
D_80178348 = D_80178350 = D_80178354 = 255; D_80178348 = D_80178350 = D_80178354 = 255;
D_80178358 = 255; D_80178358 = 255;
D_8017835C = 20; D_8017835C = 20;
Audio_PlaySfx(0x2940F026, gActors[D_i5_801BE314].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, gActors[D_i5_801BE314].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
gBossActive = D_80178488 = 0; gBossActive = D_80178488 = 0;
} }
if (gCsFrameCount == 940) { if (gCsFrameCount == 940) {
@ -6479,7 +6483,7 @@ void func_i5_801AF8F4(Player* player) {
D_80161A44 = 30000.0f; D_80161A44 = 30000.0f;
player->unk_240 = 1; player->unk_240 = 1;
func_8001CA24(0); func_8001CA24(0);
Audio_PlaySfx(0x01008016, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01008016, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2310: case 2310:
gActors[3].state++; gActors[3].state++;
@ -6553,7 +6557,7 @@ void func_i5_801B28BC(Actor* actor) {
Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->unk_138, 0.03f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->unk_138, 0.03f, 10.0f, 0.0f);
break; break;
case 11: case 11:
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0BC = 10; actor->timer_0BC = 10;
actor->state++; actor->state++;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
@ -6608,7 +6612,7 @@ void func_i5_801B28BC(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.z, 62.0f, 1.0f, 0.5f, 0); Math_SmoothStepToAngle(&actor->obj.rot.z, 62.0f, 1.0f, 0.5f, 0);
if (actor->fwork[0] > 180.0f) { if (actor->fwork[0] > 180.0f) {
actor->state++; actor->state++;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0BC = 160; actor->timer_0BC = 160;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
@ -6660,7 +6664,7 @@ void func_i5_801B28BC(Actor* actor) {
Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->unk_138, 0.03f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->unk_138, 0.03f, 10.0f, 0.0f);
break; break;
case 31: case 31:
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0C9 = 0; actor->unk_0C9 = 0;
actor->timer_0BC = 20; actor->timer_0BC = 20;
actor->state++; actor->state++;
@ -6717,12 +6721,12 @@ void func_i5_801B3554(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801BA8F0[arg1]; actor->fwork[3] = D_i5_801BA8F0[arg1];
actor->state = 30; actor->state = 30;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 20; actor->state = 20;
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
@ -6753,7 +6757,7 @@ void func_i5_801B3718(void) {
actor->state = 10; actor->state = 10;
actor->fwork[3] = D_i5_801BA900; actor->fwork[3] = D_i5_801BA900;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_801B38E0(void) { void func_i5_801B38E0(void) {

113
src/overlays/ovl_i5/fox_ti.c
View file

@ -235,7 +235,7 @@ void func_i5_801895B8(Actor* actor) {
actor->iwork[2]++; actor->iwork[2]++;
switch (actor->state) { switch (actor->state) {
case 0: case 0:
Audio_PlaySfx(0x31000017, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000017, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (actor->obj.rot.z > 1.0f) { if (actor->obj.rot.z > 1.0f) {
actor->iwork[0] = 1; actor->iwork[0] = 1;
} }
@ -358,7 +358,7 @@ void func_i5_80189CC8(Actor* actor) {
actor->health -= actor->damage; actor->health -= actor->damage;
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A008, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0CA[0] = actor->unk_044 = 0; actor->timer_0CA[0] = actor->unk_044 = 0;
actor->info.unk_1C = 0.0f; actor->info.unk_1C = 0.0f;
func_80066254(actor); func_80066254(actor);
@ -413,7 +413,7 @@ void func_i5_80189CC8(Actor* actor) {
} }
} }
} else if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) { } else if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
Audio_PlaySfx(0x11000027, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000027, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7); func_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7);
actor->timer_0C6 = 4; actor->timer_0C6 = 4;
} }
@ -548,7 +548,7 @@ void func_i5_8018A544(Actor* actor) {
actor->obj.pos.y = sp44 + temp_fv1; actor->obj.pos.y = sp44 + temp_fv1;
if (actor->unk_046 == 0) { if (actor->unk_046 == 0) {
if (actor->vel.y < -6.0f) { if (actor->vel.y < -6.0f) {
Audio_PlaySfx(0x19020006, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19020006, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->vel.y < 0.0f) { if (actor->vel.y < 0.0f) {
actor->vel.y = -actor->vel.y * 0.2f; actor->vel.y = -actor->vel.y * 0.2f;
@ -609,7 +609,7 @@ void func_i5_8018AB44(Actor* actor) {
actor->gravity = 1.0f; actor->gravity = 1.0f;
func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp3C, &sp34, &sp38); func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp3C, &sp34, &sp38);
if (actor->obj.pos.y <= (sp34 + 3.0f)) { if (actor->obj.pos.y <= (sp34 + 3.0f)) {
Audio_PlaySfx(0x19000024, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000024, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->obj.pos.y = sp34 + 3.0f; actor->obj.pos.y = sp34 + 3.0f;
actor->obj.rot.x = sp3C * (M_RTOD); actor->obj.rot.x = sp3C * (M_RTOD);
actor->obj.rot.z = sp38 * (M_RTOD); actor->obj.rot.z = sp38 * (M_RTOD);
@ -624,7 +624,7 @@ void func_i5_8018AB44(Actor* actor) {
switch (actor->unk_0D0) { switch (actor->unk_0D0) {
case 1: case 1:
Audio_PlaySfx(0x29022086, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022086, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2: case 2:
actor->unk_044 = 0; actor->unk_044 = 0;
@ -819,7 +819,7 @@ void func_i5_8018B268(Actor* actor) {
sp38->vel.y = 0.0f; sp38->vel.y = 0.0f;
sp38->vel.z = 0.0f; sp38->vel.z = 0.0f;
} else if (actor->unk_0B6 == 57) { } else if (actor->unk_0B6 == 57) {
Audio_PlaySfx(0x29000028, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29000028, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
sp4C.x = 0.0f; sp4C.x = 0.0f;
sp4C.y = actor->fwork[1]; sp4C.y = actor->fwork[1];
sp4C.z = 20.0f; sp4C.z = 20.0f;
@ -936,7 +936,7 @@ void func_i5_8018B9D0(Actor* actor) {
sp3C = gPlayer[0].pos.z - actor->obj.pos.z; sp3C = gPlayer[0].pos.z - actor->obj.pos.z;
if (actor->timer_0BE == 7) { if (actor->timer_0BE == 7) {
actor->iwork[0] = 2; actor->iwork[0] = 2;
Audio_PlaySfx(0x19000032, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000032, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BE == 0) { if (actor->timer_0BE == 0) {
temp_fa1 = SQ(sp44) + SQ(sp40) + SQ(sp3C); temp_fa1 = SQ(sp44) + SQ(sp40) + SQ(sp3C);
@ -946,7 +946,8 @@ void func_i5_8018B9D0(Actor* actor) {
if (temp_fa1 < 360000.0f) { if (temp_fa1 < 360000.0f) {
actor->timer_0BE = 0; actor->timer_0BE = 0;
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
Audio_PlaySfx(0x19000029, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000029, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
actor->iwork[0] = 1 - actor->iwork[0]; actor->iwork[0] = 1 - actor->iwork[0];
actor->timer_0BC = 5; actor->timer_0BC = 5;
} }
@ -1000,7 +1001,7 @@ void func_i5_8018B9D0(Actor* actor) {
} }
actor->obj.rot.x = (var_fa0 / 130.0f) * 90.0f; actor->obj.rot.x = (var_fa0 / 130.0f) * 90.0f;
if (actor->unk_0D0 == 1) { if (actor->unk_0D0 == 1) {
Audio_PlaySfx(0x19020008, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19020008, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
sp44 = actor->obj.pos.x - actor->unk_0D8.x; sp44 = actor->obj.pos.x - actor->unk_0D8.x;
sp40 = fabsf(sp44); sp40 = fabsf(sp44);
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
@ -1231,7 +1232,7 @@ void func_i5_8018C72C(Actor* actor) {
f32 sp30; f32 sp30;
actor->state = 8; actor->state = 8;
Audio_PlaySfx(0x29030098, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29030098, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 2; D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 2;
@ -1308,7 +1309,7 @@ void func_i5_8018C8A8(Actor* actor) {
actor->unk_0B6 = 0; actor->unk_0B6 = 0;
actor->fwork[15] = 0.0f; actor->fwork[15] = 0.0f;
} else { } else {
Audio_PlaySfx(0x29034041, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034041, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (actor->unk_0D0 == 1) { } else if (actor->unk_0D0 == 1) {
func_8007A6F0(&actor->obj.pos, 0x29121007); func_8007A6F0(&actor->obj.pos, 0x29121007);
@ -1320,7 +1321,7 @@ void func_i5_8018C8A8(Actor* actor) {
switch (actor->state) { switch (actor->state) {
case 0: case 0:
Audio_PlaySfx(0x29023020, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29023020, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0F4.y = actor->obj.rot.y; actor->unk_0F4.y = actor->obj.rot.y;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
actor->obj.pos.y += 125.0f; actor->obj.pos.y += 125.0f;
@ -1346,7 +1347,7 @@ void func_i5_8018C8A8(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f);
} }
if ((actor->obj.pos.y + actor->fwork[7] + actor->fwork[26]) <= sp9C) { if ((actor->obj.pos.y + actor->fwork[7] + actor->fwork[26]) <= sp9C) {
Audio_PlaySfx(0x29034021, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034021, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[16] = actor->obj.pos.y = sp9C; actor->fwork[16] = actor->obj.pos.y = sp9C;
actor->unk_0F4.x = spA0 * M_RTOD; actor->unk_0F4.x = spA0 * M_RTOD;
actor->unk_0F4.z = sp98 * M_RTOD; actor->unk_0F4.z = sp98 * M_RTOD;
@ -1402,7 +1403,7 @@ void func_i5_8018C8A8(Actor* actor) {
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
actor->timer_0BC = 15; actor->timer_0BC = 15;
actor->state++; actor->state++;
Audio_PlaySfx(0x31030043, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31030043, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f);
break; break;
@ -1438,7 +1439,7 @@ void func_i5_8018C8A8(Actor* actor) {
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
if (((actor->unk_0B6 == 0x28) || (actor->unk_0B6 == 0x50)) && (actor->timer_0BC == 0)) { if (((actor->unk_0B6 == 0x28) || (actor->unk_0B6 == 0x50)) && (actor->timer_0BC == 0)) {
Audio_PlaySfx(0x2902201F, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902201F, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->fwork[0xF], 1.0f, 0.7f, 0.1f, 0.01f); Math_SmoothStepToF(&actor->fwork[0xF], 1.0f, 0.7f, 0.1f, 0.01f);
actor->unk_0B6++; actor->unk_0B6++;
@ -1460,7 +1461,7 @@ void func_i5_8018C8A8(Actor* actor) {
} }
actor->unk_0B6 = actor->fwork[23]; actor->unk_0B6 = actor->fwork[23];
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
Audio_PlaySfx(0x31030043, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31030043, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
Animation_GetFrameData(&D_70067C4, actor->unk_0B6, spA4); Animation_GetFrameData(&D_70067C4, actor->unk_0B6, spA4);
@ -1477,7 +1478,7 @@ void func_i5_8018C8A8(Actor* actor) {
actor->unk_0B6 = 0; actor->unk_0B6 = 0;
actor->timer_0BC = 30; actor->timer_0BC = 30;
actor->fwork[15] = 0.0f; actor->fwork[15] = 0.0f;
Audio_PlaySfx(0x29030098, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29030098, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 5: case 5:
@ -1529,7 +1530,7 @@ void func_i5_8018C8A8(Actor* actor) {
Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158);
func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f, func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f,
0xFF, 8, 0); 0xFF, 8, 0);
Audio_PlaySfx(0x19030003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19030003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (!(actor->timer_0BC & 7)) { if (!(actor->timer_0BC & 7)) {
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
@ -1561,7 +1562,7 @@ void func_i5_8018C8A8(Actor* actor) {
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 1; D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 1;
} }
Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940C00A, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178480 = 20; D_80178480 = 20;
D_Timer_80177BD0[0] = 16; D_Timer_80177BD0[0] = 16;
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
@ -1808,7 +1809,7 @@ void func_i5_8018E5F8(Actor* actor) {
actor->iwork[7] = (s32) (spA4 / 200.0f); actor->iwork[7] = (s32) (spA4 / 200.0f);
actor->iwork[8] = (s32) ((5000.0f - spA4) / 714.0f); actor->iwork[8] = (s32) ((5000.0f - spA4) / 714.0f);
} }
Audio_PlaySfx(0x19130003, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
actor->gravity = 0.0f; actor->gravity = 0.0f;
actor->obj.pos.y = 94.0f + sp7C; actor->obj.pos.y = 94.0f + sp7C;
@ -1923,7 +1924,7 @@ void func_i5_8018E5F8(Actor* actor) {
temp_v0_4->obj.pos.z = sp54; temp_v0_4->obj.pos.z = sp54;
temp_v0_4->timer_50 = 2; temp_v0_4->timer_50 = 2;
actor->iwork[5] = (uintptr_t) temp_v0_4; actor->iwork[5] = (uintptr_t) temp_v0_4;
Audio_PlaySfx(0x3100001E, temp_v0_4->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100001E, temp_v0_4->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
temp_v0_3->obj.pos.x = sp5C; temp_v0_3->obj.pos.x = sp5C;
@ -2109,7 +2110,7 @@ void func_i5_8018F4D8(Object_80* obj80) {
D_Timer_80177BD0[0] = 7; D_Timer_80177BD0[0] = 7;
D_80178480 = 12; D_80178480 = 12;
func_i5_8018F134(obj80); func_i5_8018F134(obj80);
Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 1: case 1:
@ -2119,7 +2120,7 @@ void func_i5_8018F4D8(Object_80* obj80) {
D_Timer_80177BD0[0] = 7; D_Timer_80177BD0[0] = 7;
D_80178480 = 12; D_80178480 = 12;
func_i5_8018F134(obj80); func_i5_8018F134(obj80);
Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
obj80->state++; obj80->state++;
} }
break; break;
@ -2130,7 +2131,7 @@ void func_i5_8018F4D8(Object_80* obj80) {
D_Timer_80177BD0[0] = 7; D_Timer_80177BD0[0] = 7;
D_80178480 = 12; D_80178480 = 12;
func_i5_8018F134(obj80); func_i5_8018F134(obj80);
Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19130003, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
obj80->state++; obj80->state++;
} }
break; break;
@ -3147,15 +3148,15 @@ void func_i5_80192118(Boss* boss) {
switch (D_i5_801B8C0C[boss->dmgPart]) { switch (D_i5_801B8C0C[boss->dmgPart]) {
case 0: case 0:
D_i5_801BBEF0[30] = 15; D_i5_801BBEF0[30] = 15;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1: case 1:
D_i5_801BBEF0[33] = 15; D_i5_801BBEF0[33] = 15;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2: case 2:
D_i5_801BBEF0[34] = 15; D_i5_801BBEF0[34] = 15;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -3228,19 +3229,19 @@ void func_i5_80192118(Boss* boss) {
D_i5_801BBEF0[30] = 15; D_i5_801BBEF0[30] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1: case 1:
D_i5_801BBEF0[33] = 15; D_i5_801BBEF0[33] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 2: case 2:
D_i5_801BBEF0[34] = 15; D_i5_801BBEF0[34] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
@ -3385,8 +3386,8 @@ void func_i5_80192118(Boss* boss) {
D_i5_801BBEF4[53] = -350.0f; D_i5_801BBEF4[53] = -350.0f;
D_i5_801BBEF4[63] = 0.0f; D_i5_801BBEF4[63] = 0.0f;
D_i5_801BBEF4[55] = D_i5_801BBEF4[63]; D_i5_801BBEF4[55] = D_i5_801BBEF4[63];
Audio_PlaySfx(0x2900502A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900502A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[1] = 4; boss->swork[1] = 4;
boss->timer_050 = 120; boss->timer_050 = 120;
D_i5_801BBEF0[22] = 0; D_i5_801BBEF0[22] = 0;
@ -3739,7 +3740,7 @@ void func_i5_80193DF0(Boss* boss) {
} }
} }
D_i5_801BBF00[i].unk_26 = 4; D_i5_801BBF00[i].unk_26 = 4;
Audio_PlaySfx(0x2903B009, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (boss->fwork[38] != 0.0f) { if (boss->fwork[38] != 0.0f) {
@ -3835,7 +3836,7 @@ void func_i5_80193DF0(Boss* boss) {
if ((boss->state >= 7) && (boss->state < 0xE) && (boss->dmgType == DMG_BEAM) && if ((boss->state >= 7) && (boss->state < 0xE) && (boss->dmgType == DMG_BEAM) &&
(D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] == 2) && (D_i5_801BBEF0[8] == 0)) { (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] == 2) && (D_i5_801BBEF0[8] == 0)) {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
} }
if ((boss->state >= 7) && (boss->state < 0xE)) { if ((boss->state >= 7) && (boss->state < 0xE)) {
@ -3849,7 +3850,7 @@ void func_i5_80193DF0(Boss* boss) {
} }
if (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] != 0) { if (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] != 0) {
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 4] = 0x14; boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 4] = 0x14;
if (boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] > 0) { if (boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] > 0) {
boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] -= boss->damage; boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] -= boss->damage;
@ -3881,9 +3882,9 @@ void func_i5_80193DF0(Boss* boss) {
D_8017796C = -1; D_8017796C = -1;
boss->swork[21] = 0; boss->swork[21] = 0;
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->swork[21] < 0xB) { if (boss->swork[21] < 0xB) {
D_i5_801BBEF0[1] = 15; D_i5_801BBEF0[1] = 15;
@ -3899,7 +3900,7 @@ void func_i5_80193DF0(Boss* boss) {
boss->swork[37] |= 4; boss->swork[37] |= 4;
D_i5_801BBEF0[43] = 0; D_i5_801BBEF0[43] = 0;
} else { } else {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if ((boss->dmgType == DMG_BOMB) && (boss->dmgPart == 1) && (D_i5_801BBEF0[8] == 0)) { if ((boss->dmgType == DMG_BOMB) && (boss->dmgPart == 1) && (D_i5_801BBEF0[8] == 0)) {
@ -3912,7 +3913,7 @@ void func_i5_80193DF0(Boss* boss) {
case 1: case 1:
case 2: case 2:
case 3: case 3:
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[boss->dmgPart + 5] = 0x14; boss->swork[boss->dmgPart + 5] = 0x14;
if (boss->swork[boss->dmgPart + 9] <= 0) { if (boss->swork[boss->dmgPart + 9] <= 0) {
break; break;
@ -3942,15 +3943,15 @@ void func_i5_80193DF0(Boss* boss) {
break; break;
case 4: case 4:
if ((gBossHealthBar > 0) && (boss->swork[29] != 0) && (boss->swork[21] > 0)) { if ((gBossHealthBar > 0) && (boss->swork[29] != 0) && (boss->swork[21] > 0)) {
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[21] -= boss->damage; boss->swork[21] -= boss->damage;
if (boss->swork[21] <= 0) { if (boss->swork[21] <= 0) {
boss->swork[21] = 0; boss->swork[21] = 0;
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
D_8017796C = -1; D_8017796C = -1;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940802C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->swork[21] < 0xB) { if (boss->swork[21] < 0xB) {
D_i5_801BBEF0[1] = 0xF; D_i5_801BBEF0[1] = 0xF;
@ -3987,8 +3988,8 @@ void func_i5_80193DF0(Boss* boss) {
D_i5_801BBEF4[2] = 0.0f; D_i5_801BBEF4[2] = 0.0f;
D_i5_801BBEF4[1] = 20.0f; D_i5_801BBEF4[1] = 20.0f;
boss->swork[28]++; boss->swork[28]++;
Audio_PlaySfx(0x2900803F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900803F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x11003023, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11003023, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 3: case 3:
D_i5_801BBEF4[2] += D_i5_801BBEF4[1]; D_i5_801BBEF4[2] += D_i5_801BBEF4[1];
@ -4000,7 +4001,7 @@ void func_i5_80193DF0(Boss* boss) {
D_i5_801BBEF4[4] = 20.0f; D_i5_801BBEF4[4] = 20.0f;
boss->swork[29] = 1; boss->swork[29] = 1;
boss->swork[37] |= 1; boss->swork[37] |= 1;
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
break; break;
case 4: case 4:
@ -4037,7 +4038,7 @@ void func_i5_80193DF0(Boss* boss) {
} }
break; break;
case 8: case 8:
Audio_PlaySfx(0x11033022, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11033022, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (i = 0; i < 0x21; i++) { for (i = 0; i < 0x21; i++) {
actor = func_800A3608(0xBD); actor = func_800A3608(0xBD);
@ -4203,7 +4204,7 @@ void func_i5_80193DF0(Boss* boss) {
case 6: case 6:
boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_900FC4C) * 2); boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_900FC4C) * 2);
if ((boss->unk_04C == 0) || (boss->unk_04C == 0x44) || (boss->unk_04C == 0x60) || (boss->unk_04C == 0x95)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 0x44) || (boss->unk_04C == 0x60) || (boss->unk_04C == 0x95)) {
Audio_PlaySfx(0x2900502A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900502A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
temp_f = gPlayer[0].unk_138 - boss->obj.pos.z - 530.0f; temp_f = gPlayer[0].unk_138 - boss->obj.pos.z - 530.0f;
if (temp_f < 0.0f) { if (temp_f < 0.0f) {
@ -4235,7 +4236,7 @@ void func_i5_80193DF0(Boss* boss) {
Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 0x5C, boss->fwork[0], 360.0f, 0.01f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 0x5C, boss->fwork[0], 360.0f, 0.01f);
boss->unk_04C++; boss->unk_04C++;
if (boss->unk_04C >= (Animation_GetFrameCount(&D_900FC4C) * 2)) { if (boss->unk_04C >= (Animation_GetFrameCount(&D_900FC4C) * 2)) {
Audio_PlaySfx(0x2940702B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940702B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gPlayer[0].unk_19C = 0; gPlayer[0].unk_19C = 0;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[48] = 0; boss->fwork[48] = 0;
@ -4314,7 +4315,7 @@ void func_i5_80193DF0(Boss* boss) {
D_i5_801BBEF4[12] = 0.0f; D_i5_801BBEF4[12] = 0.0f;
} }
if ((boss->unk_04C == 0x16) || (boss->unk_04C == 0x50)) { if ((boss->unk_04C == 0x16) || (boss->unk_04C == 0x50)) {
Audio_PlaySfx(0x2940702B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940702B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (((boss->unk_04C >= 0) && (boss->unk_04C < 0x12)) || if (((boss->unk_04C >= 0) && (boss->unk_04C < 0x12)) ||
((boss->unk_04C >= 0x3E) && (boss->unk_04C < 0x50))) { ((boss->unk_04C >= 0x3E) && (boss->unk_04C < 0x50))) {
@ -4384,7 +4385,7 @@ void func_i5_80193DF0(Boss* boss) {
D_i5_801BBEF0[17]--; D_i5_801BBEF0[17]--;
} }
if (boss->unk_04C == 0) { if (boss->unk_04C == 0) {
Audio_PlaySfx(0x39435830, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x39435830, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->unk_04C == 0xF) { if (boss->unk_04C == 0xF) {
D_i5_801BBEF0[16] = 0x19; D_i5_801BBEF0[16] = 0x19;
@ -4400,7 +4401,7 @@ void func_i5_80193DF0(Boss* boss) {
D_i5_801BBEF0[7] = 0; D_i5_801BBEF0[7] = 0;
} }
if (boss->unk_04C == 0x2D) { if (boss->unk_04C == 0x2D) {
Audio_PlaySfx(0x3143102F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3143102F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[32] = 0; boss->swork[32] = 0;
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
boss->fwork[41] = 40.0f; boss->fwork[41] = 40.0f;
@ -4709,14 +4710,14 @@ void func_i5_80193DF0(Boss* boss) {
} }
} }
if ((boss->state == 6) && ((boss->unk_04C == 0x86) || (boss->unk_04C == 0xBC))) { if ((boss->state == 6) && ((boss->unk_04C == 0x86) || (boss->unk_04C == 0xBC))) {
Audio_PlaySfx(0x29406029, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29406029, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->swork[39] = 4; boss->swork[39] = 4;
D_80178480 = 7; D_80178480 = 7;
} }
if (boss->state >= 7) { if (boss->state >= 7) {
if (((boss->fwork[0xF] > 0.0f) && (boss->fwork[9] <= 0.0f)) || if (((boss->fwork[0xF] > 0.0f) && (boss->fwork[9] <= 0.0f)) ||
((boss->fwork[0xC] > 0.0f) && (boss->fwork[6] <= 0.0f))) { ((boss->fwork[0xC] > 0.0f) && (boss->fwork[6] <= 0.0f))) {
Audio_PlaySfx(0x29406029, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29406029, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->state == 0xC) { if (boss->state == 0xC) {
boss->swork[39] = 4; boss->swork[39] = 4;
D_80178480 = 0x14; D_80178480 = 0x14;
@ -4749,7 +4750,7 @@ void func_i5_80197A94(Boss* boss) {
boss->swork[38]++; boss->swork[38]++;
if ((boss->dmgType != 0) && if ((boss->dmgType != 0) &&
(((boss->state >= 0) && (boss->state <= 1)) || ((boss->state >= 4) && (boss->state <= 6)))) { (((boss->state >= 0) && (boss->state <= 1)) || ((boss->state >= 4) && (boss->state <= 6)))) {
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
} }
if ((gPlayer[0].unk_1D4 != 0) && (boss->swork[39] > 0)) { if ((gPlayer[0].unk_1D4 != 0) && (boss->swork[39] > 0)) {
@ -5182,7 +5183,7 @@ void func_i5_801990DC(Boss* boss) {
Actor* actor; Actor* actor;
if (boss->unk_044 == 0) { if (boss->unk_044 == 0) {
Audio_PlaySfx(0x2940902D, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940902D, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
func_800182F4(0x113200FF); func_800182F4(0x113200FF);
func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f); func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f);

14
src/overlays/ovl_i5/fox_ti_cs.c
View file

@ -19,7 +19,7 @@ void func_i5_80187530(Actor* actor) {
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} }
@ -35,7 +35,7 @@ void func_i5_801875D0(Actor* actor, s32 arg1) {
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i5_8018769C(Player* player) { void func_i5_8018769C(Player* player) {
@ -94,7 +94,7 @@ void func_i5_8018769C(Player* player) {
if (gCsFrameCount == 430) { if (gCsFrameCount == 430) {
player->unk_1D0 = 2; player->unk_1D0 = 2;
player->timer_1F8 = 10; player->timer_1F8 = 10;
Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
gCsCamAtX = player->pos.x; gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y; gCsCamAtY = player->pos.y;
@ -206,7 +206,7 @@ void func_i5_8018769C(Player* player) {
if (D_80177A10[0] == 0) { if (D_80177A10[0] == 0) {
D_80177A10[0]++; D_80177A10[0]++;
Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -273,11 +273,11 @@ void func_i5_80188108(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801B7348[arg1]; actor->fwork[3] = D_i5_801B7348[arg1];
actor->state = 30; actor->state = 30;
Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 20; actor->state = 20;
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
} }
@ -499,7 +499,7 @@ void func_i5_801882CC(Player* player) {
D_80161A44 = 30000.0f; D_80161A44 = 30000.0f;
player->unk_240 = 1; player->unk_240 = 1;
func_8001CA24(0); func_8001CA24(0);
Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x01008016U, player->sfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }

98
src/overlays/ovl_i6/fox_andross.c
View file

@ -325,7 +325,7 @@ void func_i6_80188468(void) {
actor->iwork[14] = 1; actor->iwork[14] = 1;
actor->obj.id = OBJ_ACTOR_199; actor->obj.id = OBJ_ACTOR_199;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_80188528(Actor* actor) { void func_i6_80188528(Actor* actor) {
@ -430,11 +430,12 @@ void func_i6_80188A4C(Boss* boss) {
if (boss->swork[4] == 0) { if (boss->swork[4] == 0) {
boss->swork[2] = 10; boss->swork[2] = 10;
boss->swork[3] = 15; boss->swork[3] = 15;
Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500FU, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->health -= boss->damage; boss->health -= boss->damage;
if ((boss->health != 0) && (boss->health <= 0)) { if ((boss->health != 0) && (boss->health <= 0)) {
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09AU, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
func_80042EC0(boss); func_80042EC0(boss);
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0;
boss->state = 20; boss->state = 20;
@ -460,7 +461,8 @@ void func_i6_80188A4C(Boss* boss) {
boss->timer_050 = 50; boss->timer_050 = 50;
boss->fwork[3] = gPlayer[0].pos.x; boss->fwork[3] = gPlayer[0].pos.x;
boss->fwork[5] = gPlayer[0].unk_138; boss->fwork[5] = gPlayer[0].unk_138;
Audio_PlaySfx(0x2940B096U, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940B096U, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} }
break; break;
@ -798,7 +800,7 @@ void func_i6_80189B70(Boss* boss) {
(fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 300.0f) && (boss->state < 11) && (boss->timer_05A == 0)) { (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 300.0f) && (boss->state < 11) && (boss->timer_05A == 0)) {
boss->state = 11; boss->state = 11;
boss->timer_050 = 150; boss->timer_050 = 150;
Audio_PlaySfx(0x31408097, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31408097, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
switch (boss->state) { switch (boss->state) {
@ -810,7 +812,7 @@ void func_i6_80189B70(Boss* boss) {
func_i6_80189098(boss); func_i6_80189098(boss);
boss->swork[5] = 300; boss->swork[5] = 300;
boss->state++; boss->state++;
Audio_PlaySfx(0x11034074, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11034074, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[21] = 255.0f; boss->fwork[21] = 255.0f;
boss->fwork[22] = 255.0f; boss->fwork[22] = 255.0f;
boss->fwork[23] = 0.0f; boss->fwork[23] = 0.0f;
@ -881,7 +883,7 @@ void func_i6_80189B70(Boss* boss) {
gPlayer[0].unk_238 = 1; gPlayer[0].unk_238 = 1;
Math_SmoothStepToF(&D_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); Math_SmoothStepToF(&D_800CA230, 0.15f, 0.2f, 0.004f, 0.0f);
if (boss->timer_050 == 120) { if (boss->timer_050 == 120) {
Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
gPlayer[0].unk_0D0 = D_80161A54; gPlayer[0].unk_0D0 = D_80161A54;
@ -922,7 +924,7 @@ void func_i6_80189B70(Boss* boss) {
boss->obj.pos.z = boss->fwork[5] + sp64.z; boss->obj.pos.z = boss->fwork[5] + sp64.z;
boss->unk_078.y = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement)); boss->unk_078.y = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement));
boss->state = 13; boss->state = 13;
Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->timer_054 = 90; boss->timer_054 = 90;
} }
break; break;
@ -1044,7 +1046,7 @@ void func_i6_80189B70(Boss* boss) {
func_800B7184(gPlayer, 1); func_800B7184(gPlayer, 1);
func_8001C8B8(0); func_8001C8B8(0);
func_8001D444(0, D_800C9E90[gCurrentLevel][1], 0, 0xFF); func_8001D444(0, D_800C9E90[gCurrentLevel][1], 0, 0xFF);
Audio_PlaySfx(0x11403076, D_800C5D28, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11403076, gDefaultSfxPos, 0U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177CA4 = gHitCount; D_80177CA4 = gHitCount;
break; break;
@ -1140,10 +1142,10 @@ void func_i6_80189B70(Boss* boss) {
if (boss->swork[5] != 0) { if (boss->swork[5] != 0) {
boss->swork[5]--; boss->swork[5]--;
if (boss->swork[5] == 0) { if (boss->swork[5] == 0) {
Audio_PlaySfx(0x11032075, gActors[10].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11032075, gActors[10].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x11032075, gActors[11].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11032075, gActors[11].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x3103108B, gActors[10].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3103108B, gActors[10].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x3103108B, gActors[11].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3103108B, gActors[11].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
gActors[10].obj.pos.x = boss->obj.pos.x + 200.0f; gActors[10].obj.pos.x = boss->obj.pos.x + 200.0f;
gActors[10].obj.pos.y = boss->obj.pos.y - 200.0f; gActors[10].obj.pos.y = boss->obj.pos.y - 200.0f;
@ -1621,9 +1623,9 @@ void func_i6_8018D2B0(Boss* boss) {
if ((boss->state == 9) || (boss->state == 10)) { if ((boss->state == 9) || (boss->state == 10)) {
if (boss->health <= 0) { if (boss->health <= 0) {
D_Timer_80161A60 = 8; D_Timer_80161A60 = 8;
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31009063, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31009063, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x19403070, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19403070, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001A55C(boss->sfxPos, 0x11030073); func_8001A55C(boss->sfxPos, 0x11030073);
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
@ -1632,12 +1634,12 @@ void func_i6_8018D2B0(Boss* boss) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7;
gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_1D0 = 0;
} else if (boss->health < 50) { } else if (boss->health < 50) {
Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (boss->health <= 0) { } else if (boss->health <= 0) {
Audio_PlaySfx(0x19403070, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19403070, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
if (D_8017827C == 0) { if (D_8017827C == 0) {
@ -1650,7 +1652,7 @@ void func_i6_8018D2B0(Boss* boss) {
gCsFrameCount = 0; gCsFrameCount = 0;
boss->timer_05C = 100; boss->timer_05C = 100;
} else { } else {
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1660,14 +1662,14 @@ void func_i6_8018D2B0(Boss* boss) {
if (boss->state < 11) { if (boss->state < 11) {
boss->swork[6] -= boss->damage; boss->swork[6] -= boss->damage;
boss->swork[0] = 30; boss->swork[0] = 30;
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->swork[6] <= 0) { if (boss->swork[6] <= 0) {
boss->swork[6] = 100; boss->swork[6] = 100;
boss->state = 12; boss->state = 12;
boss->timer_050 = 120; boss->timer_050 = 120;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
Audio_PlaySfx(0x1940306F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1675,14 +1677,14 @@ void func_i6_8018D2B0(Boss* boss) {
if (boss->state < 12) { if (boss->state < 12) {
boss->swork[6] -= boss->damage; boss->swork[6] -= boss->damage;
boss->swork[1] = 30; boss->swork[1] = 30;
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (boss->swork[6] <= 0) { if (boss->swork[6] <= 0) {
boss->swork[6] = 100; boss->swork[6] = 100;
boss->state = 13; boss->state = 13;
boss->timer_050 = 120; boss->timer_050 = 120;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
Audio_PlaySfx(0x1940306F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
break; break;
@ -1786,7 +1788,7 @@ void func_i6_8018DA94(Boss* boss, Vec3f* arg1) {
RAND_FLOAT(0.5f) + 1.0f); RAND_FLOAT(0.5f) + 1.0f);
} }
func_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5); func_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5);
Audio_PlaySfx(0x2903B009, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903B009, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
extern Animation D_C00208C; extern Animation D_C00208C;
@ -1946,7 +1948,7 @@ void func_i6_8018DBF0(Boss* boss) {
case 1: case 1:
boss->timer_05A = 100; boss->timer_05A = 100;
if (boss->timer_054 == 65) { if (boss->timer_054 == 65) {
Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 != 0) { if (boss->timer_050 != 0) {
boss->fwork[6] = -3000.0f; boss->fwork[6] = -3000.0f;
@ -2016,7 +2018,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[0] = player->pos.x; boss->fwork[0] = player->pos.x;
boss->fwork[3] = player->pos.y + 1000.0f; boss->fwork[3] = player->pos.y + 1000.0f;
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
Audio_PlaySfx(0x1940306A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->unk_04C > 60) { if (boss->unk_04C > 60) {
if (boss->unk_04C == 76) { if (boss->unk_04C == 76) {
@ -2064,7 +2066,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[0] = player->pos.x; boss->fwork[0] = player->pos.x;
boss->fwork[3] = player->pos.y; boss->fwork[3] = player->pos.y;
if (boss->unk_04C == 55) { if (boss->unk_04C == 55) {
Audio_PlaySfx(0x1940306A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->unk_04C > 55) { if (boss->unk_04C > 55) {
boss->fwork[6] = -1500.0f; boss->fwork[6] = -1500.0f;
@ -2119,7 +2121,7 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[1], 2.0f, 1.0f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[1], 2.0f, 1.0f, 1.0f, 0);
Math_SmoothStepToF(&boss->fwork[4], 2.0f, 1.0f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[4], 2.0f, 1.0f, 1.0f, 0);
if (boss->unk_04C == 5) { if (boss->unk_04C == 5) {
Audio_PlaySfx(0x1940306B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
boss->swork[7] = 1; boss->swork[7] = 1;
boss->fwork[14] = 100.0f; boss->fwork[14] = 100.0f;
@ -2137,7 +2139,7 @@ void func_i6_8018DBF0(Boss* boss) {
func_i6_8018D9C0(boss); func_i6_8018D9C0(boss);
} else { } else {
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
Audio_PlaySfx(0x1940306C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 != 0) { if (boss->timer_050 != 0) {
boss->fwork[6] = -4000.0f; boss->fwork[6] = -4000.0f;
@ -2165,7 +2167,7 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[13], 80.0f, 1.0f, 15.0f, 0); Math_SmoothStepToF(&boss->fwork[13], 80.0f, 1.0f, 15.0f, 0);
} }
if (boss->unk_04C == 25) { if (boss->unk_04C == 25) {
Audio_PlaySfx(0x09008015, D_i6_801A67B8, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09008015, D_i6_801A67B8, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
@ -2181,7 +2183,7 @@ void func_i6_8018DBF0(Boss* boss) {
func_i6_8018D9C0(boss); func_i6_8018D9C0(boss);
} else { } else {
if (boss->unk_04C == 48) { if (boss->unk_04C == 48) {
Audio_PlaySfx(0x3103108B, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3103108B, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->unk_04C > 48) { if (boss->unk_04C > 48) {
func_i6_8018D0D8(boss); func_i6_8018D0D8(boss);
@ -2314,10 +2316,10 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = 0.0f; boss->fwork[3] = 0.0f;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C == 15) { if (boss->unk_04C == 15) {
Audio_PlaySfx(0x29022088, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022088, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((boss->unk_04C > 35) && (boss->unk_04C < 150) && !(boss->unk_04C & 0x1F)) { if ((boss->unk_04C > 35) && (boss->unk_04C < 150) && !(boss->unk_04C & 0x1F)) {
Audio_PlaySfx(0x29022089, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022089, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (player->state_1C8 == PLAYERSTATE_1C8_11) { if (player->state_1C8 == PLAYERSTATE_1C8_11) {
D_Timer_80177BD0[0] = 10; D_Timer_80177BD0[0] = 10;
} }
@ -2375,7 +2377,7 @@ void func_i6_8018DBF0(Boss* boss) {
limbCount = Animation_GetFrameData(&D_C023B54, boss->unk_04C, spD0); limbCount = Animation_GetFrameData(&D_C023B54, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (boss->unk_04C == 10) { if (boss->unk_04C == 10) {
Audio_PlaySfx(0x3140208A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3140208A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((boss->unk_04C == 13) && (player->state_1C8 == PLAYERSTATE_1C8_11)) { if ((boss->unk_04C == 13) && (player->state_1C8 == PLAYERSTATE_1C8_11)) {
player->unk_234 = 1; player->unk_234 = 1;
@ -2437,7 +2439,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[9] = 0.2f; boss->fwork[9] = 0.2f;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->swork[8] = 2; boss->swork[8] = 2;
Audio_PlaySfx(0x1940306D, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940306D, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
} }
} }
@ -2482,7 +2484,7 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[7], 20.0f, 0.1f, 0.1f, 0); Math_SmoothStepToF(&boss->fwork[7], 20.0f, 0.1f, 0.1f, 0);
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C == 10) { if (boss->unk_04C == 10) {
Audio_PlaySfx(0x31022087, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31022087, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
boss->unk_04C++; boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C0240D0)) { if (boss->unk_04C >= Animation_GetFrameCount(&D_C0240D0)) {
@ -2530,7 +2532,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->unk_044 = 2; boss->unk_044 = 2;
boss->timer_050 = 70; boss->timer_050 = 70;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
Audio_PlaySfx(0x1940307C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1940307C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_050 == 15) { if (boss->timer_050 == 15) {
boss->swork[10] = 80; boss->swork[10] = 80;
@ -2626,7 +2628,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->health = 100; boss->health = 100;
boss->timer_050 = 50; boss->timer_050 = 50;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
Audio_PlaySfx(0x11030073, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030073, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001D444(0, 0x8021, 0, 0xFF); func_8001D444(0, 0x8021, 0, 0xFF);
break; break;
} }
@ -3257,7 +3259,7 @@ void func_i6_80192E94(Actor* actor) {
actor->vwork[0].z = actor->obj.pos.z; actor->vwork[0].z = actor->obj.pos.z;
actor->health = 30; actor->health = 30;
actor->unk_0F4.z = actor->obj.rot.z; actor->unk_0F4.z = actor->obj.rot.z;
Audio_PlaySfx(0x11000028, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11000028, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 1: case 1:
otherActor = gActors; otherActor = gActors;
@ -3477,8 +3479,8 @@ void func_i6_801939A0(s32 actorIndex) {
actor->unk_0B6 = 1000; actor->unk_0B6 = 1000;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
static Vec3f D_i6_801A6878[4] = { static Vec3f D_i6_801A6878[4] = {
@ -3501,14 +3503,14 @@ void func_i6_80193AE4(s32 actorIndex) {
if (actorIndex == 0) { if (actorIndex == 0) {
actor->state = 200; actor->state = 200;
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
return; return;
} }
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->fwork[7] = RAND_FLOAT(360.0f); actor->fwork[7] = RAND_FLOAT(360.0f);
actor->fwork[8] = RAND_FLOAT(360.0f); actor->fwork[8] = RAND_FLOAT(360.0f);
actor->state = 100; actor->state = 100;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
//! @bug This references a variable in another overlay, causing undefined behavior. //! @bug This references a variable in another overlay, causing undefined behavior.
@ -3573,7 +3575,7 @@ void func_i6_80193C4C(Player* player) {
break; break;
case 111: case 111:
player->unk_1D0 = 2; player->unk_1D0 = 2;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_190 = player->unk_194 = 7.0f; player->unk_190 = player->unk_194 = 7.0f;
D_80177A48[0] = 0.0f; D_80177A48[0] = 0.0f;
D_80177A48[1] = 0.0f; D_80177A48[1] = 0.0f;
@ -3596,7 +3598,7 @@ void func_i6_80193C4C(Player* player) {
sp68.y = RAND_FLOAT_CENTERED(150.0f); sp68.y = RAND_FLOAT_CENTERED(150.0f);
sp68.z = 0.0f; sp68.z = 0.0f;
if (gCsFrameCount == 50) { if (gCsFrameCount == 50) {
Audio_PlaySfx(0x11403071, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11403071, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001D400(0); func_8001D400(0);
} }
if (gCsFrameCount > 40) { if (gCsFrameCount > 40) {
@ -3671,7 +3673,7 @@ void func_i6_80193C4C(Player* player) {
} }
break; break;
case 150: case 150:
Audio_PlaySfx(0x1900602A, D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900602A, gDefaultSfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 340: case 340:
func_8001A55C(player->sfxPos, 0x11403071); func_8001A55C(player->sfxPos, 0x11403071);
@ -3723,7 +3725,7 @@ void func_i6_80193C4C(Player* player) {
} }
if (gCsFrameCount == 40) { if (gCsFrameCount == 40) {
func_i6_801939A0(10); func_i6_801939A0(10);
Audio_PlaySfx(0x2940F026, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80178480 = 30; D_80178480 = 30;
gOverlayStage = 1; gOverlayStage = 1;
D_Timer_80177BD0[0] = 30; D_Timer_80177BD0[0] = 30;

123
src/overlays/ovl_i6/fox_sy.c
View file

@ -61,7 +61,7 @@ void func_i6_80197B30(Actor* actor, s32 timer) {
actor->timer_04C = timer; actor->timer_04C = timer;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_80197C64(Effect* effect) { void func_i6_80197C64(Effect* effect) {
@ -196,7 +196,7 @@ void func_i6_80198244(Boss* boss) {
} }
boss->fwork[10] = 181.0f; boss->fwork[10] = 181.0f;
boss->fwork[34] = 2.8f; boss->fwork[34] = 2.8f;
Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_801983E4(Boss* boss) { void func_i6_801983E4(Boss* boss) {
@ -321,7 +321,7 @@ void func_i6_80198ABC(Boss* boss) {
boss->fwork[41] = 1.8f; boss->fwork[41] = 1.8f;
} }
} }
Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
switch (D_80177A10[8]) { switch (D_80177A10[8]) {
case 0: case 0:
@ -419,7 +419,7 @@ void func_i6_80198F5C(Boss* boss) {
} }
gPlayer[0].unk_114 = 0.0f; gPlayer[0].unk_114 = 0.0f;
} }
Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x101E00FF); func_800182F4(0x101E00FF);
func_800182F4(0x111E00FF); func_800182F4(0x111E00FF);
return; return;
@ -468,11 +468,11 @@ void func_i6_80198F5C(Boss* boss) {
} }
} else { } else {
if (boss->index != 0) { if (boss->index != 0) {
Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else if (boss->health > 70) { } else if (boss->health > 70) {
Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29034003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2943500F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) {
func_8002E4F8(gMsg_ID_14350, RCID_BOSS_SECTORY); func_8002E4F8(gMsg_ID_14350, RCID_BOSS_SECTORY);
@ -522,7 +522,7 @@ void func_i6_80199438(Boss* boss) {
gHitCount += 4; gHitCount += 4;
} }
if (boss->timer_058 == 50) { if (boss->timer_058 == 50) {
Audio_PlaySfx(0x2903A060, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A060, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80137E84[gMainController] = 1; D_80137E84[gMainController] = 1;
D_Timer_80177BD0[gMainController] = 20; D_Timer_80177BD0[gMainController] = 20;
D_80177850 = 15; D_80177850 = 15;
@ -608,7 +608,7 @@ void func_i6_80199438(Boss* boss) {
} }
func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f); func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6034304); boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6034304);
Audio_PlaySfx(0x2903A06F, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A06F, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (boss->health <= 80) { if (boss->health <= 80) {
@ -681,7 +681,7 @@ void func_i6_80199DAC(Boss* boss) {
boss->fwork[12] = 320.0f; boss->fwork[12] = 320.0f;
if (boss->timer_056 == 0) { if (boss->timer_056 == 0) {
boss->timer_056 = 51; boss->timer_056 = 51;
Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -737,7 +737,7 @@ void func_i6_8019A434(Boss* boss) {
boss->fwork[13] = COS_DEG(boss->unk_078.y) * boss->fwork[45]; boss->fwork[13] = COS_DEG(boss->unk_078.y) * boss->fwork[45];
boss->fwork[12] = 30.0f; boss->fwork[12] = 30.0f;
boss->fwork[10] = 181.0f; boss->fwork[10] = 181.0f;
Audio_PlaySfx(0x19031003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19031003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_8019A520(Boss* boss) { void func_i6_8019A520(Boss* boss) {
@ -757,7 +757,7 @@ void func_i6_8019A520(Boss* boss) {
} }
if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) {
Audio_PlaySfx(0x29022019, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022019, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -777,7 +777,7 @@ void func_i6_8019A66C(Boss* boss) {
func_i6_8019BC14(boss); func_i6_8019BC14(boss);
} }
if (boss->timer_056 == 60) { if (boss->timer_056 == 60) {
Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->fwork[34] = 4.5f; boss->fwork[34] = 4.5f;
if (Rand_ZeroOne() > 0.5f) { if (Rand_ZeroOne() > 0.5f) {
func_8002E4F8(gMsg_ID_14330, 160); func_8002E4F8(gMsg_ID_14330, 160);
@ -829,7 +829,7 @@ void func_i6_8019A898(Boss* boss) {
Math_SmoothStepToAngle(&boss->unk_078.y, yAngle1, 0.1f, 2.0f, 0.1f); Math_SmoothStepToAngle(&boss->unk_078.y, yAngle1, 0.1f, 2.0f, 0.1f);
boss->fwork[0] = 1.0f; boss->fwork[0] = 1.0f;
if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) {
Audio_PlaySfx(0x29022019, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29022019, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else { } else {
boss->timer_056 = 0; boss->timer_056 = 0;
@ -888,9 +888,9 @@ void func_i6_8019AAF0(Boss* boss) {
if (boss->unk_04C >= boss->swork[32] - 29) { if (boss->unk_04C >= boss->swork[32] - 29) {
if (boss->unk_04C == boss->swork[32] - 29) { if (boss->unk_04C == boss->swork[32] - 29) {
if (boss->swork[31] == 11) { if (boss->swork[31] == 11) {
Audio_PlaySfx(0x2903401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903401C, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2902306D, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306D, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (boss->unk_04C >= (boss->swork[32] - 5)) { if (boss->unk_04C >= (boss->swork[32] - 5)) {
@ -965,7 +965,7 @@ void func_i6_8019AEEC(Boss* boss) {
gActors[59].state = 6; gActors[59].state = 6;
} }
if (boss->obj.pos.y == 0.0f) { if (boss->obj.pos.y == 0.0f) {
Audio_PlaySfx(0x0100001D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0100001D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&boss->obj.pos.y, 365.0f, 0.1f, 5.0f, 0.1f); Math_SmoothStepToF(&boss->obj.pos.y, 365.0f, 0.1f, 5.0f, 0.1f);
Math_SmoothStepToF(&gActors[59].obj.pos.y, 153.0f, 0.1f, 5.0f, 0.1f); Math_SmoothStepToF(&gActors[59].obj.pos.y, 153.0f, 0.1f, 5.0f, 0.1f);
@ -975,7 +975,7 @@ void func_i6_8019AEEC(Boss* boss) {
gBossHealthBar = boss->health * 1.7f; gBossHealthBar = boss->health * 1.7f;
} }
if (boss->obj.pos.y == 365.0f) { if (boss->obj.pos.y == 365.0f) {
Audio_PlaySfx(0x09002013, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09002013, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
boss->timer_050 = 20; boss->timer_050 = 20;
boss->timer_056 = 135; boss->timer_056 = 135;
} }
@ -989,7 +989,7 @@ void func_i6_8019AEEC(Boss* boss) {
boss->swork[21] = 0; boss->swork[21] = 0;
} }
if (boss->timer_056 == 95) { if (boss->timer_056 == 95) {
Audio_PlaySfx(0x3102505A, gActors[59].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3102505A, gActors[59].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (boss->timer_056 < 96) { if (boss->timer_056 < 96) {
Math_SmoothStepToF(&gActors[59].fwork[0], 0.0f, 0.1f, 0.2f, 0.05f); Math_SmoothStepToF(&gActors[59].fwork[0], 0.0f, 0.1f, 0.2f, 0.05f);
@ -1006,7 +1006,7 @@ void func_i6_8019AEEC(Boss* boss) {
D_i6_801A8440[0] = boss->sfxPos[0]; D_i6_801A8440[0] = boss->sfxPos[0];
D_i6_801A8440[1] = boss->sfxPos[1]; D_i6_801A8440[1] = boss->sfxPos[1];
D_i6_801A8440[2] = -500.0f; D_i6_801A8440[2] = -500.0f;
Audio_PlaySfx(0x2902306C, D_i6_801A8440, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, D_i6_801A8440, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_KillSfx(gActors[59].sfxPos); Audio_KillSfx(gActors[59].sfxPos);
boss->fwork[34] = 4.5f; boss->fwork[34] = 4.5f;
gActors[59].vel.z = -40.0f; gActors[59].vel.z = -40.0f;
@ -1196,9 +1196,9 @@ void func_i6_8019BC14(Boss* boss) {
gPlayer[0].pos.y = sp48; gPlayer[0].pos.y = sp48;
gPlayer[0].unk_138 = gPlayer[0].pos.z = sp44; gPlayer[0].unk_138 = gPlayer[0].pos.z = sp44;
if (boss->index == 0) { if (boss->index == 0) {
Audio_PlaySfx(0x2901306EU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2901306EU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2900306BU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900306BU, boss->sfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1296,11 +1296,11 @@ void func_i6_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) {
if (sp2C > 0.0f) { if (sp2C > 0.0f) {
if (boss->fwork[41] == 0.0f) { if (boss->fwork[41] == 0.0f) {
boss->fwork[41] = ABS(sp2C * 0.01f) + 0.8f; boss->fwork[41] = ABS(sp2C * 0.01f) + 0.8f;
Audio_PlaySfx(0x09000003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} else if (boss->fwork[42] == 0.0f) { } else if (boss->fwork[42] == 0.0f) {
boss->fwork[42] = ABS(sp2C * 0.01f) + 0.8f; boss->fwork[42] = ABS(sp2C * 0.01f) + 0.8f;
Audio_PlaySfx(0x09000003, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000003, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
} }
@ -1540,7 +1540,7 @@ void func_i6_8019C888(Boss* boss) {
if (boss->dmgPart == 0) { if (boss->dmgPart == 0) {
if (boss->swork[25] == 0) { if (boss->swork[25] == 0) {
boss->swork[24] = 15; boss->swork[24] = 15;
Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, boss->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
func_i6_80198F5C(boss); func_i6_80198F5C(boss);
} }
@ -1920,7 +1920,7 @@ void func_i6_8019EB80(void) {
actor->scale = 0.125f; actor->scale = 0.125f;
} }
actor->iwork[11] = 1; actor->iwork[11] = 1;
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -2055,10 +2055,10 @@ void func_i6_8019EE60(Player* player) {
} }
if (gCsFrameCount == 343) { if (gCsFrameCount == 343) {
Audio_PlaySfx(0x09000007, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000007, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (gCsFrameCount == 395) { if (gCsFrameCount == 395) {
Audio_PlaySfx(0x09000013, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000013, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_80177A48[1] += D_80177A48[2]; D_80177A48[1] += D_80177A48[2];
Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0);
@ -2183,7 +2183,7 @@ void func_i6_8019EE60(Player* player) {
D_80177830 = 0; D_80177830 = 0;
break; break;
case 1440: case 1440:
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
func_800182F4(0x103200FF); func_800182F4(0x103200FF);
@ -2249,7 +2249,7 @@ void func_i6_8019FF00(Actor* actor) {
break; break;
case 2: case 2:
actor->state = 3; actor->state = 3;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:
@ -2276,7 +2276,7 @@ void func_i6_8019FF00(Actor* actor) {
} else { } else {
if (gCsFrameCount == 540) { if (gCsFrameCount == 540) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->obj.pos.x, 230.0f, 1.0f, 13.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, 230.0f, 1.0f, 13.0f, 0.0f);
} }
@ -2286,7 +2286,7 @@ void func_i6_8019FF00(Actor* actor) {
if (gCsFrameCount >= 535) { if (gCsFrameCount >= 535) {
if (gCsFrameCount == 535) { if (gCsFrameCount == 535) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->obj.pos.x, -1000.0f, 1.0f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, -1000.0f, 1.0f, 20.0f, 0.0f);
Math_SmoothStepToAngle(&actor->unk_0F4.z, 45.0f, 1.0f, 4.0f, 0.0f); Math_SmoothStepToAngle(&actor->unk_0F4.z, 45.0f, 1.0f, 4.0f, 0.0f);
@ -2301,7 +2301,7 @@ void func_i6_8019FF00(Actor* actor) {
if (gCsFrameCount >= 525) { if (gCsFrameCount >= 525) {
if (gCsFrameCount == 525) { if (gCsFrameCount == 525) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
Math_SmoothStepToF(&actor->obj.pos.x, 1500.0f, 1.0f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, 1500.0f, 1.0f, 20.0f, 0.0f);
Math_SmoothStepToAngle(&actor->unk_0F4.z, 315.0f, 1.0f, 2.0f, 0.0f); Math_SmoothStepToAngle(&actor->unk_0F4.z, 315.0f, 1.0f, 2.0f, 0.0f);
@ -2404,8 +2404,8 @@ void func_i6_801A06A4(Actor* actor, s32 arg1) {
actor->state = arg1 + 7; actor->state = arg1 + 7;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x3100000C, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -2441,7 +2441,7 @@ void func_i6_801A07FC(Actor* actor0, Actor* actor1) {
actor1->obj.rot.x = actor0->obj.rot.x; actor1->obj.rot.x = actor0->obj.rot.x;
actor1->obj.rot.y = actor0->obj.rot.y; actor1->obj.rot.y = actor0->obj.rot.y;
actor1->unk_0B6 = 42; actor1->unk_0B6 = 42;
Audio_PlaySfx(0x2900306B, actor1->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900306B, actor1->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { void func_i6_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
@ -2456,7 +2456,7 @@ void func_i6_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
actor->timer_0BC = 35; actor->timer_0BC = 35;
actor->iwork[0] = 255; actor->iwork[0] = 255;
actor->unk_0B6 = 43; actor->unk_0B6 = 43;
Audio_PlaySfx(0x2900306B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900306B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
void func_i6_801A0AC0(Player* player) { void func_i6_801A0AC0(Player* player) {
@ -2666,13 +2666,13 @@ void func_i6_801A0AC0(Player* player) {
func_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, func_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z,
gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10); gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10);
func_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5); func_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5);
Audio_PlaySfx(0x2903A060, gActors[11].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A060, gActors[11].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 188: case 188:
gActors[5].fwork[0] = gActors[6].fwork[0] = gActors[7].fwork[0] = 3.8f; gActors[5].fwork[0] = gActors[6].fwork[0] = gActors[7].fwork[0] = 3.8f;
Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 150: case 150:
Object_Kill(&gActors[11].obj, gActors[11].sfxPos); Object_Kill(&gActors[11].obj, gActors[11].sfxPos);
@ -2684,11 +2684,11 @@ void func_i6_801A0AC0(Player* player) {
break; break;
case 155: case 155:
gActors[7].fwork[0] = 3.8f; gActors[7].fwork[0] = 3.8f;
Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 163: case 163:
gActors[6].fwork[0] = 3.8f; gActors[6].fwork[0] = 3.8f;
Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 240: case 240:
gActors[9].iwork[0] = 255; gActors[9].iwork[0] = 255;
@ -2699,7 +2699,7 @@ void func_i6_801A0AC0(Player* player) {
gActors[9].iwork[5] = 0; gActors[9].iwork[5] = 0;
gActors[9].iwork[6] = 255; gActors[9].iwork[6] = 255;
gActors[9].iwork[7] = 100; gActors[9].iwork[7] = 100;
Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2940F026, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801779A8[gMainController] = 100.0f; D_801779A8[gMainController] = 100.0f;
break; break;
case 260: case 260:
@ -2766,7 +2766,7 @@ void func_i6_801A0AC0(Player* player) {
gActors[5].iwork[4] = gActors[6].iwork[4] = gActors[7].iwork[4] = 1; gActors[5].iwork[4] = gActors[6].iwork[4] = gActors[7].iwork[4] = 1;
gActors[5].fwork[5] = gActors[6].fwork[5] = gActors[7].fwork[5] = 80.0f; gActors[5].fwork[5] = gActors[6].fwork[5] = gActors[7].fwork[5] = 80.0f;
gActors[6].fwork[1] = 60.0f; gActors[6].fwork[1] = 60.0f;
Audio_PlaySfx(0x31000011, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31000011, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gCsFrameCount >= 285) && (gActors[9].iwork[3] != 0)) { if ((gCsFrameCount >= 285) && (gActors[9].iwork[3] != 0)) {
gActors[9].iwork[3] -= 5; gActors[9].iwork[3] -= 5;
@ -2868,11 +2868,11 @@ void func_i6_801A0AC0(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 340: case 340:
gActors[5].fwork[0] = 1.8f; gActors[5].fwork[0] = 1.8f;
Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 350: case 350:
gActors[6].fwork[0] = 1.8f; gActors[6].fwork[0] = 1.8f;
Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 370: case 370:
gActors[6].fwork[5] = 0.0f; gActors[6].fwork[5] = 0.0f;
@ -2913,7 +2913,7 @@ void func_i6_801A0AC0(Player* player) {
if (gCsFrameCount >= 390) { if (gCsFrameCount >= 390) {
if (gActors[6].iwork[4] != 0) { if (gActors[6].iwork[4] != 0) {
gActors[6].fwork[0] = 1.8f; gActors[6].fwork[0] = 1.8f;
Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gActors[6].obj.rot.x = (gActors[6].obj.rot.x - 2.0f); gActors[6].obj.rot.x = (gActors[6].obj.rot.x - 2.0f);
if (gActors[6].obj.rot.x <= 320.0f) { if (gActors[6].obj.rot.x <= 320.0f) {
gActors[6].iwork[4] = 0; gActors[6].iwork[4] = 0;
@ -2932,7 +2932,8 @@ void func_i6_801A0AC0(Player* player) {
gActors[6].obj.rot.y = (gActors[6].obj.rot.y + 6.0f); gActors[6].obj.rot.y = (gActors[6].obj.rot.y + 6.0f);
if (gActors[6].obj.rot.y > 230.0f) { if (gActors[6].obj.rot.y > 230.0f) {
gActors[6].fwork[0] = 2.8f; gActors[6].fwork[0] = 2.8f;
Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[6].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} }
} }
@ -2971,7 +2972,8 @@ void func_i6_801A0AC0(Player* player) {
gActors[7].obj.rot.y = (gActors[7].obj.rot.y + 6.0f); gActors[7].obj.rot.y = (gActors[7].obj.rot.y + 6.0f);
if (gActors[7].obj.rot.y > 230.0f) { if (gActors[7].obj.rot.y > 230.0f) {
gActors[7].fwork[0] = 2.8f; gActors[7].fwork[0] = 2.8f;
Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} }
} }
@ -3003,7 +3005,8 @@ void func_i6_801A0AC0(Player* player) {
gActors[5].obj.rot.y += 7.0f; gActors[5].obj.rot.y += 7.0f;
if (gActors[5].obj.rot.y > 174.0f) { if (gActors[5].obj.rot.y > 174.0f) {
gActors[5].fwork[0] = 2.8f; gActors[5].fwork[0] = 2.8f;
Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
} }
} }
@ -3051,7 +3054,7 @@ void func_i6_801A0AC0(Player* player) {
Object_Kill(&gActors[10].obj, gActors[10].sfxPos); Object_Kill(&gActors[10].obj, gActors[10].sfxPos);
func_i6_801A07FC(&gActors[5], &gActors[10]); func_i6_801A07FC(&gActors[5], &gActors[10]);
gActors[7].fwork[0] = 1.8f; gActors[7].fwork[0] = 1.8f;
Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[7].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
break; break;
case 458: case 458:
gActors[7].iwork[4] = 0; gActors[7].iwork[4] = 0;
@ -3075,7 +3078,7 @@ void func_i6_801A0AC0(Player* player) {
case 545: case 545:
player->unk_194 = 10.0f; player->unk_194 = 10.0f;
player->unk_190 = 10.0f; player->unk_190 = 10.0f;
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80137E84[gMainController] = 1; D_80137E84[gMainController] = 1;
D_Timer_80177BD0[gMainController] = 5; D_Timer_80177BD0[gMainController] = 5;
break; break;
@ -3089,7 +3092,7 @@ void func_i6_801A0AC0(Player* player) {
gActors[5].obj.rot.y = gActors[6].obj.rot.y = 180.0f; gActors[5].obj.rot.y = gActors[6].obj.rot.y = 180.0f;
gActors[7].obj.rot.y = 140.0f; gActors[7].obj.rot.y = 140.0f;
gActors[5].fwork[0] = 2.8f; gActors[5].fwork[0] = 2.8f;
Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2902306C, gActors[5].sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_1D0++; player->unk_1D0++;
break; break;
} }
@ -3353,7 +3356,7 @@ void func_i6_801A3BD4(Actor* actor) {
func_8007F11C(0x162, actor->fwork[16], actor->fwork[17], actor->fwork[18], 100.0f); func_8007F11C(0x162, actor->fwork[16], actor->fwork[17], actor->fwork[18], 100.0f);
gPlayer[0].pos.x = sp1E4; gPlayer[0].pos.x = sp1E4;
gPlayer[0].pos.y = sp1E0; gPlayer[0].pos.y = sp1E0;
Audio_PlaySfx(0x2900306B, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2900306B, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
actor->unk_048 = 0; actor->unk_048 = 0;
} }
@ -3406,7 +3409,7 @@ void func_i6_801A3BD4(Actor* actor) {
func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 8.0f, 0xA); actor->vel.z, 8.0f, 0xA);
func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 5); func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 5);
Audio_PlaySfx(0x2903A060, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903A060, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (actor->timer_0BE == 0) { if (actor->timer_0BE == 0) {
Object_Kill(&actor->obj, actor->sfxPos); Object_Kill(&actor->obj, actor->sfxPos);
@ -3502,10 +3505,10 @@ void func_i6_801A3BD4(Actor* actor) {
actor->unk_0D0 = 0; actor->unk_0D0 = 0;
if (actor->unk_0D2 == 0) { if (actor->unk_0D2 == 0) {
actor->iwork[18] = 15; actor->iwork[18] = 15;
Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x29121007, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x2903300E, actor->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.1f, 10); actor->vel.z, 0.1f, 10);
@ -3606,7 +3609,7 @@ void func_i6_801A4E44(Object_80* obj80) {
Vec3f sp30; Vec3f sp30;
if (obj80->state == 0) { if (obj80->state == 0) {
Audio_PlaySfx(0x1900404F, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900404F, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
obj80->state++; obj80->state++;
} }
if (!(gGameFrameCount & 3)) { if (!(gGameFrameCount & 3)) {
@ -3645,7 +3648,7 @@ void func_i6_801A52B8(Object_80* obj80) {
Vec3f sp38; Vec3f sp38;
if (obj80->state == 0) { if (obj80->state == 0) {
Audio_PlaySfx(0x1900404F, obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900404F, obj80->sfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
obj80->state++; obj80->state++;
} }
if (!(gGameFrameCount & 3)) { if (!(gGameFrameCount & 3)) {

4
src/overlays/ovl_i6/fox_ve2.c
View file

@ -367,7 +367,7 @@ void func_i6_80196D88(Player* player) {
if (player->unk_120 >= 180.0f) { if (player->unk_120 >= 180.0f) {
player->unk_120 -= 360.0f; player->unk_120 -= 360.0f;
} }
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
gCsFrameCount = 0; gCsFrameCount = 0;
@ -396,7 +396,7 @@ void func_i6_80196D88(Player* player) {
} }
if (gCsFrameCount == 105) { if (gCsFrameCount == 105) {
Audio_PlaySfx(0x09000002, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, player->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
} }

42
src/overlays/ovl_menu/fox_map.c
View file

@ -2161,7 +2161,7 @@ void func_menu_801A0954(void) {
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
func_8001D444(0, 0x3C, 0, 0xFF); func_8001D444(0, 0x3C, 0, 0xFF);
Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900001FU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (planetId = 0; planetId < PLANET_MAX; planetId++) { for (planetId = 0; planetId < PLANET_MAX; planetId++) {
if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) { if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@ -2373,7 +2373,7 @@ void func_menu_801A1528(void) {
} }
if (temp == 0.0f) { if (temp == 0.0f) {
Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900001FU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD948 = 0; D_menu_801CD948 = 0;
D_menu_801CD97C = 1; D_menu_801CD97C = 1;
D_menu_801CD944 = 3; D_menu_801CD944 = 3;
@ -2382,7 +2382,7 @@ void func_menu_801A1528(void) {
} }
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
Audio_PlaySfx(0x4900001FU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900001FU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
for (planetId = 0; planetId < PLANET_MAX; planetId++) { for (planetId = 0; planetId < PLANET_MAX; planetId++) {
if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) { if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@ -2490,9 +2490,9 @@ void func_menu_801A1C14(void) {
if (sCurrentPlanetId == PLANET_CORNERIA) { if (sCurrentPlanetId == PLANET_CORNERIA) {
D_80178340 = 0; D_80178340 = 0;
D_menu_801CD948 = 10; D_menu_801CD948 = 10;
Audio_PlaySfx(0x0940A00BU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940A00BU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x19003012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19003012U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD948++; D_menu_801CD948++;
} }
} else { } else {
@ -2508,7 +2508,7 @@ void func_menu_801A1C14(void) {
case 10: case 10:
if (D_menu_801CEB34 == 4) { if (D_menu_801CEB34 == 4) {
Audio_PlaySfx(0x19003012U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19003012U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD948 = 2; D_menu_801CD948 = 2;
} }
break; break;
@ -2516,7 +2516,7 @@ void func_menu_801A1C14(void) {
case 2: case 2:
func_menu_801A2674(); func_menu_801A2674();
if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) { if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) {
Audio_PlaySfx(0x19004013U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19004013U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD9D8 = 1; D_menu_801CD9D8 = 1;
if (sCurrentPlanetId == PLANET_CORNERIA) { if (sCurrentPlanetId == PLANET_CORNERIA) {
D_menu_801CEB48[0] = true; D_menu_801CEB48[0] = true;
@ -2935,9 +2935,9 @@ void func_menu_801A2EB8(void) {
if (D_menu_801CD9C4 == 30) { if (D_menu_801CD9C4 == 30) {
if (D_menu_801CD93C == 2) { if (D_menu_801CD93C == 2) {
Audio_PlaySfx(0x0900802AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0900802AU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
Audio_PlaySfx(0x09000032U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000032U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -3005,7 +3005,7 @@ void func_menu_801A2EB8(void) {
} }
if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) { if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) {
Audio_PlaySfx(0x19000026U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000026U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) { if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) {
@ -3163,7 +3163,7 @@ void func_menu_801A36A8(void) {
} }
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD948 = 3; D_menu_801CD948 = 3;
} }
} }
@ -3617,7 +3617,7 @@ void func_menu_801A4D7C(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
func_8001D6DC(0); func_8001D6DC(0);
Audio_PlaySfx(0x49000003U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CF000[D_menu_801CEFDC] = 10; D_menu_801CF000[D_menu_801CEFDC] = 10;
if (((D_menu_801CD93C != 0) && (D_menu_801CEFDC == 2)) || ((D_menu_801CD93C == 0) && (D_menu_801CEFDC == 1))) { if (((D_menu_801CD93C != 0) && (D_menu_801CEFDC == 2)) || ((D_menu_801CD93C == 0) && (D_menu_801CEFDC == 1))) {
@ -3808,7 +3808,7 @@ bool func_menu_801A5770(void) {
} }
if (ret) { if (ret) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
return ret; return ret;
@ -4018,7 +4018,7 @@ void func_menu_801A5E80(void) {
case 4: case 4:
if (D_menu_801CD9B8 == 0) { if (D_menu_801CD9B8 == 0) {
Audio_PlaySfx(0x49002016U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49002016U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CD9B8 = 75; D_menu_801CD9B8 = 75;
D_menu_801B8280++; D_menu_801B8280++;
} }
@ -4282,7 +4282,7 @@ void func_menu_801A659C(void) {
func_8001A838(0x1100204C); func_8001A838(0x1100204C);
if (sCurrentPlanetId != 9) { if (sCurrentPlanetId != 9) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_menu_801CEFC8 = 0; D_menu_801CEFC8 = 0;
@ -4943,7 +4943,7 @@ void func_menu_801A809C(PlanetId planetId) {
D_menu_801CD998 += 8; D_menu_801CD998 += 8;
if (D_menu_801CD998 == 8) { if (D_menu_801CD998 == 8) {
Audio_PlaySfx(0x49008030U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49008030U, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (D_menu_801CD998 >= 255) { if (D_menu_801CD998 >= 255) {
@ -5848,7 +5848,7 @@ void func_menu_801AB300(void) {
D_menu_801CEA74 = 255; D_menu_801CEA74 = 255;
D_80177D50 = 1.3f; D_80177D50 = 1.3f;
Audio_PlaySfx(0x4100001EU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4100001EU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001ACDC(Message_IdFromPtr(D_80178308)); func_8001ACDC(Message_IdFromPtr(D_80178308));
D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2;
@ -6371,7 +6371,7 @@ void func_menu_801AC9A0(s32 index) {
switch (D_80177BD8[index]) { switch (D_80177BD8[index]) {
case 1: case 1:
Audio_PlaySfx(0x1900404DU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1900404DU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80177BD8[index] = 11; D_80177BD8[index] = 11;
break; break;
@ -6595,7 +6595,7 @@ void func_menu_801AD11C(void) {
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
if (D_menu_801CD944 == 3 && D_80161A34 == 7) { if (D_menu_801CD944 == 3 && D_80161A34 == 7) {
if (D_menu_801CEFD0) { if (D_menu_801CEFD0) {
Audio_PlaySfx(0x4900100AU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900100AU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} else { } else {
func_8001D6DC(1); func_8001D6DC(1);
D_menu_801CEFC4 = 1; D_menu_801CEFC4 = 1;
@ -6640,7 +6640,7 @@ void func_menu_801AD11C(void) {
} }
if (D_menu_801CF014 == 0 && var_a3 == 1) { if (D_menu_801CF014 == 0 && var_a3 == 1) {
func_8001D10C(D_800C5D28, 0x1100204C); func_8001D10C(gDefaultSfxPos, 0x1100204C);
D_menu_801CF014 = 1; D_menu_801CF014 = 1;
} }
@ -6694,7 +6694,7 @@ void func_menu_801AD11C(void) {
} }
if (D_menu_801CF010 == 0 && var_t0 == 1) { if (D_menu_801CF010 == 0 && var_t0 == 1) {
Audio_PlaySfx(0x1100004CU, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1100004CU, gDefaultSfxPos, 4U, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801CF010 = 1; D_menu_801CF010 = 1;
} }

104
src/overlays/ovl_menu/fox_option.c
View file

@ -913,13 +913,13 @@ void Option_MainMenuUpdate(void) {
temp1 = func_menu_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, temp1 = func_menu_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController,
&D_menu_801B9180); &D_menu_801B9180);
// clang-format off // clang-format off
if (temp1 != 0) { Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (temp1 != 0) { Audio_PlaySfx(0x49000022, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb); }
// clang-format on // clang-format on
if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) { if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) {
temp2 = func_menu_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190); temp2 = func_menu_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190);
if (temp2 != 0) { if (temp2 != 0) {
Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000022, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_menu_801B91B0) { if (D_menu_801B91B0) {
sOptionCardList[0].unk_00.unk_08 = D_8004C50; sOptionCardList[0].unk_00.unk_08 = D_8004C50;
sOptionCardList[0].unk_00.unk_10 = 80; sOptionCardList[0].unk_00.unk_10 = 80;
@ -939,7 +939,7 @@ void Option_MainMenuUpdate(void) {
if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) { if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) {
temp2 = func_menu_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198); temp2 = func_menu_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198);
if (temp2 != 0) { if (temp2 != 0) {
Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000022, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_menu_801B91AC) { if (D_menu_801B91AC) {
sOptionCardList[4].unk_00.unk_08 = D_8004C50; sOptionCardList[4].unk_00.unk_08 = D_8004C50;
sOptionCardList[4].unk_00.unk_10 = 80; sOptionCardList[4].unk_00.unk_10 = 80;
@ -957,13 +957,13 @@ void Option_MainMenuUpdate(void) {
} }
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
Audio_PlaySfx(0x49000020, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000020, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4]; D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4];
D_menu_801B91BC = 0; D_menu_801B91BC = 0;
D_menu_801B912C = 11; D_menu_801B912C = 11;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;
D_menu_801B8280 = 1; D_menu_801B8280 = 1;
D_menu_801B912C = 100; D_menu_801B912C = 100;
@ -1182,18 +1182,18 @@ void Option_VersusUpdate(void) {
case 1: case 1:
// clang-format off // clang-format off
if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { Audio_PlaySfx(0x49000022, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { Audio_PlaySfx(0x49000022, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb); }
// clang-format on // clang-format on
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
Audio_PlaySfx(0x49000020, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000020, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8]; D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8];
D_menu_801B91BC = 0; D_menu_801B91BC = 0;
D_menu_801B912C = 11; D_menu_801B912C = 11;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
gDrawMode = DRAWMODE_0; gDrawMode = DRAWMODE_0;
@ -1361,7 +1361,7 @@ void Option_SoundUpdate(void) {
temp = func_menu_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250); temp = func_menu_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250);
if (temp != 0) { if (temp != 0) {
D_menu_801B9270[sp34] = 255.0f; D_menu_801B9270[sp34] = 255.0f;
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (D_menu_801B9288 == 0) { if (D_menu_801B9288 == 0) {
@ -1377,12 +1377,12 @@ void Option_SoundUpdate(void) {
} }
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9288 = (D_menu_801B9288 + 1) & 3; D_menu_801B9288 = (D_menu_801B9288 + 1) & 3;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_menu_801B9284 == 1) { if (D_menu_801B9284 == 1) {
D_menu_801B9284 = 0; D_menu_801B9284 = 0;
func_8001D8F4(D_menu_801B9284); func_8001D8F4(D_menu_801B9284);
@ -1400,7 +1400,7 @@ void func_menu_80194AEC(void) {
s32 pad; s32 pad;
if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) { if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gSoundMode = sp3C; gSoundMode = sp3C;
if (gSoundMode >= 3) { if (gSoundMode >= 3) {
gSoundMode = 0; gSoundMode = 0;
@ -1652,7 +1652,7 @@ void Option_ExpertSoundUpdate(void) {
f32 sp28 = D_menu_801B931C; f32 sp28 = D_menu_801B931C;
if (func_menu_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) { if (func_menu_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B931C = sp28; D_menu_801B931C = sp28;
} }
@ -1663,14 +1663,14 @@ void Option_ExpertSoundUpdate(void) {
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
if (!D_menu_801B9320) { if (!D_menu_801B9320) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_8001D444(0, 36, 0, 255); func_8001D444(0, 36, 0, 255);
gDrawMode = DRAWMODE_0; gDrawMode = DRAWMODE_0;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9244 = 1; D_menu_801B9244 = 1;
} else { } else {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x100100FF); func_800182F4(0x100100FF);
func_800182F4(0x110100FF); func_800182F4(0x110100FF);
D_menu_801B9320 = false; D_menu_801B9320 = false;
@ -1841,7 +1841,7 @@ void Option_DataUpdate(void) {
case 1: case 1:
D_menu_801B91CC = 2; D_menu_801B91CC = 2;
Audio_PlaySfx(0x0940A00B, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0940A00B, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801779A8[gMainController] = 50.0f; D_801779A8[gMainController] = 50.0f;
D_80177990[gMainController] = 0; D_80177990[gMainController] = 0;
break; break;
@ -1894,36 +1894,36 @@ void Option_DataUpdate(void) {
void func_menu_8019669C(void) { void func_menu_8019669C(void) {
if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) { if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) {
if (func_menu_8019C5A0(&D_menu_801B91C0) != 0) { if (func_menu_8019C5A0(&D_menu_801B91C0) != 0) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if (1) {} if (1) {}
} }
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
if (D_menu_801B91CC == 3) { if (D_menu_801B91CC == 3) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} else { } else {
D_menu_801B9330[D_menu_801B91C0] = 10; D_menu_801B9330[D_menu_801B91C0] = 10;
if (D_menu_801B91C0 == 0) { if (D_menu_801B91C0 == 0) {
if (D_menu_801B91CC == 1) { if (D_menu_801B91CC == 1) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 2; D_menu_801B912C = 2;
} else { } else {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} }
} else { } else {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 4; D_menu_801B912C = 4;
} }
} }
} else if (gControllerPress[gMainController].button & B_BUTTON) { } else if (gControllerPress[gMainController].button & B_BUTTON) {
if (D_menu_801B91CC == 1) { if (D_menu_801B91CC == 1) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 2; D_menu_801B912C = 2;
} else { } else {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} }
} }
@ -2051,7 +2051,7 @@ void Option_RankingUpdate(void) {
func_menu_80196FC4(); func_menu_80196FC4();
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gDrawMode = DRAWMODE_0; gDrawMode = DRAWMODE_0;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;
@ -2066,7 +2066,7 @@ void Option_RankingDraw(void) {
void func_menu_80196FC4(void) { void func_menu_80196FC4(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B93E0 ^= 1; D_menu_801B93E0 ^= 1;
} }
@ -2080,7 +2080,7 @@ void func_menu_80196FC4(void) {
void func_menu_80197074(void) { void func_menu_80197074(void) {
if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) { if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f; D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f;
@ -2097,7 +2097,7 @@ void func_menu_8019715C(void) {
if (D_menu_801B91D0 != 0) { if (D_menu_801B91D0 != 0) {
if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) { if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f; D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f;
D_menu_801B91D0 = 0; D_menu_801B91D0 = 0;
@ -2665,19 +2665,19 @@ void func_menu_8019949C(void) {
if (!(D_menu_801B93C4 & (1 << i))) { if (!(D_menu_801B93C4 & (1 << i))) {
func_menu_8019C824(&D_menu_801B9358[i]); func_menu_8019C824(&D_menu_801B9358[i]);
if (func_menu_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) { if (func_menu_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
if (D_menu_801B93C4 == 15) { if (D_menu_801B93C4 == 15) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B91EC = 10; D_menu_801B91EC = 10;
D_menu_801B912C++; D_menu_801B912C++;
break; break;
} else { } else {
if (!(D_menu_801B93C4 & (1 << i))) { if (!(D_menu_801B93C4 & (1 << i))) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gHandicap[i] = D_menu_801AED3C[i]; gHandicap[i] = D_menu_801AED3C[i];
D_menu_801B9358[i] = 255.0f; D_menu_801B9358[i] = 255.0f;
D_menu_801B9348[i] = 10; D_menu_801B9348[i] = 10;
@ -2688,11 +2688,11 @@ void func_menu_8019949C(void) {
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
if (D_menu_801B93C4 & (1 << i)) { if (D_menu_801B93C4 & (1 << i)) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B93C4 &= (1 << i) ^ 15; D_menu_801B93C4 &= (1 << i) ^ 15;
} else { } else {
func_8001D444(0, 36, 0, 255); func_8001D444(0, 36, 0, 255);
Audio_PlaySfx(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000021, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_menu_8019B8A0(2); func_menu_8019B8A0(2);
D_menu_801B9248 = 1; D_menu_801B9248 = 1;
break; break;
@ -2995,19 +2995,19 @@ void func_menu_8019A2E0(void) {
} }
if (func_menu_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { if (func_menu_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_801778A4 = D_menu_801B93D4 + 1; D_801778A4 = D_menu_801B93D4 + 1;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_menu_8019A080(); func_menu_8019A080();
D_menu_801B936C = 10; D_menu_801B936C = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
Option_InitEntry(); Option_InitEntry();
@ -3035,20 +3035,20 @@ void func_menu_8019A4DC(void) {
} }
if (func_menu_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { if (func_menu_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9340 = D_menu_801B93DC; D_menu_801B9340 = D_menu_801B93DC;
D_801778C8 = D_menu_801B93DC; D_801778C8 = D_menu_801B93DC;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_menu_8019A080(); func_menu_8019A080();
D_menu_801B937C = 10; D_menu_801B937C = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
Option_InitEntry(); Option_InitEntry();
@ -3076,12 +3076,12 @@ void func_menu_8019A6DC(void) {
continue; continue;
} }
if (func_menu_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) { if (func_menu_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_80161A28 = D_menu_801B93D8; D_80161A28 = D_menu_801B93D8;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_80161A28 == 0) { if (D_80161A28 == 0) {
gVersusStage = VS_STAGE_CORNERIA; gVersusStage = VS_STAGE_CORNERIA;
if (D_menu_801B93D0 == 30) { if (D_menu_801B93D0 == 30) {
@ -3097,7 +3097,7 @@ void func_menu_8019A6DC(void) {
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_menu_801B93D0 == 20) { if (D_menu_801B93D0 == 20) {
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
@ -3132,13 +3132,13 @@ void func_menu_8019A954(void) {
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B91EC = 10; D_menu_801B91EC = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_menu_8019A080(); func_menu_8019A080();
D_menu_801B933C = 0; D_menu_801B933C = 0;
D_menu_801B91F0 = 0; D_menu_801B91F0 = 0;
@ -3793,7 +3793,7 @@ bool func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250
temp2 = *arg0; temp2 = *arg0;
if ((s32) temp2 != (s32) temp) { if ((s32) temp2 != (s32) temp) {
Audio_PlaySfx(0x49004007, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49004007, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
var_a2 = true; var_a2 = true;
} }
@ -3952,7 +3952,7 @@ void func_menu_8019CD54(void) {
if (D_menu_801B9138 == 0) { if (D_menu_801B9138 == 0) {
if (func_menu_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController, if (func_menu_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController,
&D_menu_801B9160[D_menu_801B9098])) { &D_menu_801B9160[D_menu_801B9098])) {
Audio_PlaySfx(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000002, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]]; D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]];
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
D_menu_801B9100[D_menu_801B9098] = 0.0f; D_menu_801B9100[D_menu_801B9098] = 0.0f;
@ -3962,7 +3962,7 @@ void func_menu_8019CD54(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
if (D_menu_801B9138 != 0) { if (D_menu_801B9138 != 0) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9140[0] = 10; D_menu_801B9140[0] = 10;
D_menu_801B9140[1] = 10; D_menu_801B9140[1] = 10;
D_menu_801B9140[2] = 10; D_menu_801B9140[2] = 10;
@ -3972,7 +3972,7 @@ void func_menu_8019CD54(void) {
} else { } else {
if (D_menu_801B9098 < 3) { if (D_menu_801B9098 < 3) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
D_menu_801B9140[D_menu_801B9098] = 15; D_menu_801B9140[D_menu_801B9098] = 15;
D_menu_801B9128 = 1; D_menu_801B9128 = 1;
@ -3982,7 +3982,7 @@ void func_menu_8019CD54(void) {
} }
if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) { if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) {
Audio_PlaySfx(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x4900101D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
if (D_menu_801B9138 != 0) { if (D_menu_801B9138 != 0) {
D_menu_801B9138 = 0; D_menu_801B9138 = 0;
} }
@ -4320,7 +4320,7 @@ void func_menu_8019DE74(void) {
func_menu_8019715C(); func_menu_8019715C();
if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
gDrawMode = DRAWMODE_0; gDrawMode = DRAWMODE_0;
D_menu_801B912C = 0; D_menu_801B912C = 0;
@ -4363,10 +4363,10 @@ void Option_InvoiceUpdate(void) {
case 1: case 1:
if (D_menu_801B9178 == 0) { if (D_menu_801B9178 == 0) {
if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) { if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) {
Audio_PlaySfx(0x49000032, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000032, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
if ((gTotalHits * 64) >= 70000) { if ((gTotalHits * 64) >= 70000) {
Audio_PlaySfx(0x49000033, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000033, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
D_menu_801B9178 = 20; D_menu_801B9178 = 20;
D_menu_801B912C++; D_menu_801B912C++;
@ -4375,7 +4375,7 @@ void Option_InvoiceUpdate(void) {
case 2: case 2:
if ((D_menu_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) { if ((D_menu_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) {
Audio_PlaySfx(0x19031083, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19031083, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B9090 = 1; D_menu_801B9090 = 1;
D_menu_801B9178 = 60; D_menu_801B9178 = 60;
D_menu_801B912C++; D_menu_801B912C++;

36
src/overlays/ovl_menu/fox_title.c
View file

@ -1123,8 +1123,8 @@ void func_menu_8018994C(void) {
} }
if (D_menu_801B82B8 == 638) { if (D_menu_801B82B8 == 638) {
Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Radio_PlayMessage(gMsg_ID_60, RCID_ROB64_TITLE); Radio_PlayMessage(gMsg_ID_60, RCID_ROB64_TITLE);
} }
@ -1348,8 +1348,8 @@ void func_menu_8018A644(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
func_menu_8018A338(); func_menu_8018A338();
Audio_PlaySfx(0x49000014, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000014, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x0140001C, D_menu_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0140001C, D_menu_801B84D8, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
D_menu_801B82C8 = 0.0f; D_menu_801B82C8 = 0.0f;
@ -1512,8 +1512,8 @@ void func_menu_8018ACEC(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
func_menu_8018ABC0(); func_menu_8018ABC0();
Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B82CC = 0.01f; D_menu_801B82CC = 0.01f;
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
@ -1689,7 +1689,7 @@ void func_menu_8018B5C4(void) {
case 10: case 10:
if (D_menu_801B82A8 == 0) { if (D_menu_801B82A8 == 0) {
Audio_PlaySfx(0x0100001D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0100001D, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
D_menu_801B82C0 = 1; D_menu_801B82C0 = 1;
} }
@ -1704,7 +1704,7 @@ void func_menu_8018B5C4(void) {
D_menu_801B9048 -= 0.41f; D_menu_801B9048 -= 0.41f;
if (D_menu_801B9048 < 0.0f) { if (D_menu_801B9048 < 0.0f) {
D_menu_801B9048 = 0.0f; D_menu_801B9048 = 0.0f;
Audio_PlaySfx(0x09002013, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09002013, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
} }
} }
@ -1718,7 +1718,8 @@ void func_menu_8018B5C4(void) {
} }
if (D_menu_801B84E8[i].unk_38 == 1) { if (D_menu_801B84E8[i].unk_38 == 1) {
Audio_PlaySfx(0x1950107A, D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x1950107A, D_menu_801B84E8[i].unk_50, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
}; };
if (D_menu_801B84E8[i].unk_38 == 0) { if (D_menu_801B84E8[i].unk_38 == 0) {
@ -1753,7 +1754,8 @@ void func_menu_8018B5C4(void) {
if (D_menu_801B82B4 == 226) { if (D_menu_801B82B4 == 226) {
D_menu_801B7BF0 = 0; D_menu_801B7BF0 = 0;
Audio_PlaySfx(0x0100001E, D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x0100001E, D_menu_801B84E8[3].unk_50, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
D_menu_801B86BC = 105.0f; D_menu_801B86BC = 105.0f;
D_menu_801B86C0 = 0.0f; D_menu_801B86C0 = 0.0f;
@ -1847,7 +1849,8 @@ void func_menu_8018B5C4(void) {
case 3: case 3:
if (D_menu_801B82A8 == 0) { if (D_menu_801B82A8 == 0) {
func_8001A55C(D_menu_801B84E8[3].unk_50, 0x0100001E); func_8001A55C(D_menu_801B84E8[3].unk_50, 0x0100001E);
Audio_PlaySfx(0x09000002, D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x09000002, D_menu_801B84E8[3].unk_50, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
D_menu_801B82A8 = 4; D_menu_801B82A8 = 4;
@ -2035,8 +2038,8 @@ void func_menu_8018C644(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_menu_8018C1C0(); func_menu_8018C1C0();
@ -2063,7 +2066,8 @@ void func_menu_8018C644(void) {
D_menu_801B84E8[i].unk_38--; D_menu_801B84E8[i].unk_38--;
} else { } else {
if (D_menu_801B84E8[i].unk_38 == 0) { if (D_menu_801B84E8[i].unk_38 == 0) {
Audio_PlaySfx(0x19000001, D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x19000001, D_menu_801B84E8[i].unk_50, 0, &gDefaultScale, &gDefaultScale,
&gDefaultReverb);
D_menu_801B84E8[i].unk_38 = -1; D_menu_801B84E8[i].unk_38 = -1;
D_menu_801B84E8[i].unk_4C = 1; D_menu_801B84E8[i].unk_4C = 1;
} }
@ -3217,7 +3221,7 @@ void func_menu_80190EA4(void) {
switch (D_menu_801B8280) { switch (D_menu_801B8280) {
case 0: case 0:
if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;
D_menu_801B8280 = 1; D_menu_801B8280 = 1;
gControllerLock = 0x1E; gControllerLock = 0x1E;
@ -3249,7 +3253,7 @@ void func_menu_80190FD0(void) {
if (((gControllerPress[gMainController].button & START_BUTTON) || if (((gControllerPress[gMainController].button & START_BUTTON) ||
(gControllerPress[gMainController].button & A_BUTTON)) && (gControllerPress[gMainController].button & A_BUTTON)) &&
(D_menu_801B8280 == 0)) { (D_menu_801B8280 == 0)) {
Audio_PlaySfx(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x49000003, gDefaultSfxPos, 4, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
func_800182F4(0x101E00FF); func_800182F4(0x101E00FF);
func_800182F4(0x111E00FF); func_800182F4(0x111E00FF);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;

2
yamls/us/main.yaml
View file

@ -203,7 +203,7 @@
# DATA - Microcode # DATA - Microcode
- [0xC3EE0, data, aspmain] - [0xC3EE0, data, aspmain]
- [0xC4210, data, audiotables] - [0xC4210, .data, audiotables]
- [0xC49D0, data, f3dex] - [0xC49D0, data, f3dex]
# DATA - Nintendo Libraries # DATA - Nintendo Libraries