izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

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 22:56:08 -03:00
committed by GitHub
parent 647f0f5d2e
commit e7fbb38c98
57 changed files with 3379 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/buffers.h
+1 -1
View File
@@ -7,7 +7,7 @@ extern u64 gDramStack[];
extern u8 gOSYieldData[];
extern FrameBuffer gZBuffer; // z buffer
extern u8 gTaskOutputBuffer[];
extern u8 gAudioDataBuffer[];
extern u8 gAudioHeap[];
extern u16 gTextureRenderBuffer[];
extern u16 gFillBuffer[];
extern FrameBuffer gFrameBuffers[]; // 8038F800
include/functions.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include "sf64mesg.h"
// audio
void func_8000FFCC(void);
void AudioLoad_Init(void);
void func_80016A50(void);
void func_800182F4(s32);
include/sf64audio_provisional.h
+367 -206
View File
File diff suppressed because it is too large Load Diff
include/variables.h
+9 -9
View File
@@ -7,15 +7,15 @@
#include "sf64object.h"
#include "sf64player.h"
extern f32 D_800C5D28[];
extern f32 D_800C5D34;
extern s8 D_800C5D3C;
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 f32 gDefaultSfxPos[];
extern f32 gDefaultScale;
extern s8 gDefaultReverb;
extern s8 gThreadCmdWritePos;
extern s8 gThreadCmdReadPos;
extern OSMesgQueue* gAudioTaskStartQueue;
extern OSMesgQueue* gThreadCmdProcQueue;
extern OSMesgQueue* gAudioUnkQueue;
extern OSMesgQueue* gAudioResetQueue;
extern OSMesg D_80156600[1];
extern OSMesg D_80156608[4];
linker_scripts/us/symbol_addrs.txt
+7 -2
View File
@@ -25,7 +25,12 @@ D_8000001C = 0x8000001C;//ignore:true
D_80000024 = 0x80000024;//ignore:true
D_801D0001 = 0x801D0001;//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_1000000 = 0x01000000;//ignore:true
D_A000000 = 0x0A000000;//ignore:true
// constant for K1 access
D_A0000000 = 0xA0000000;//ignore:true
@@ -35,7 +40,7 @@ D_BFF00000 = 0xBFF00000;//ignore:true
D_BFF08000 = 0xBFF08000;//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_C0000008 = 0xC0000008;//ignore:true
D_C000000C = 0xC000000C;//ignore:true
@@ -64,7 +69,7 @@ D_801613E0 = 0x801613E0;//size:0x18
D_800CC124 = 0x800CC124;//type:u8
D_800C9E90 = 0x800C9E90;//size:0x70
D_800D3180 = 0x800D3180; // size:0x1E
D_800D3180 = 0x800D3180; // size:0x20
gSetupDLs = 0x800D31B0; // size:0x18C0
D_800CFCA0 = 0x800CFCA0;
linker_scripts/us/symbol_addrs_EBFBE0.txt
+2 -1
View File
@@ -8,7 +8,8 @@ D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu
sPlanetList = 0x801AF7E8;// 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_801B7BA0 = 0x801B7BA0;// segment:ovl_menu
D_menu_801B8248 = 0x801B8248; // size:0x28 segment:ovl_menu
linker_scripts/us/symbol_addrs_audio.txt
+245 -65
View File
@@ -1,7 +1,187 @@
D_800C57EC = 0x800C57EC;
D_800C7380 = 0x800C7380;
D_800C5FF4 = 0x800C5FF4; //type:u16 size:5000
gSampleBankTableInit = 0x800C3610;
gSampleBankTableInitEntries = 0x800C3620;
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_80008364 = 0x80008364;
func_80008780 = 0x80008780;
@@ -34,89 +214,89 @@ AudioHeap_InitPool = 0x8000BF6C;
AudioHeap_InitPersistentCache = 0x8000BF94;
AudioHeap_InitTemporaryCache = 0x8000BFA8;
AudioHeap_ResetPool = 0x8000BFD8;
func_8000BFE8 = 0x8000BFE8;
func_8000C044 = 0x8000C044;
func_8000C0C0 = 0x8000C0C0;
func_8000C13C = 0x8000C13C;
func_8000C1F8 = 0x8000C1F8;
AudioHeap_InitMainPools = 0x8000BFE8;
AudioHeap_InitSessionPools = 0x8000C044;
AudioHeap_InitCachePools = 0x8000C0C0;
AudioHeap_InitPersistentPoolsAndCaches = 0x8000C13C;
AudioHeap_InitTemporaryPoolsAndCaches = 0x8000C1F8;
AudioHeap_AllocCached = 0x8000C2B4;
AudioHeap_SearchCaches = 0x8000C990;
AudioHeap_SearchRegularCaches = 0x8000C9E8;
func_8000CAF4 = 0x8000CAF4;
func_8000CEC8 = 0x8000CEC8;
func_8000D08C = 0x8000D08C;
func_8000D104 = 0x8000D104;
func_8000D4A8 = 0x8000D4A8;
AudioHeap_UpdateReverbs = 0x8000CEC8;
AudioHeap_ClearCurrentAiBuffer = 0x8000D08C;
AudioHeap_ResetStep = 0x8000D104;
AudioHeap_Init = 0x8000D4A8;
AudioHeap_SearchPermanentCache = 0x8000DB0C;
func_8000DB64 = 0x8000DB64;
AudioHeap_AllocPermanent = 0x8000DB64;
AudioHeap_AllocTemporarySampleCache = 0x8000DBE4;
AudioHeap_AllocPersistentSampleCache = 0x8000DC34;
AudioHeap_AllocPersistentSampleCache_2 = 0x8000DC84;
func_8000DCD4 = 0x8000DCD4;
AudioHeap_InitSampleCaches = 0x8000DCD4;
AudioHeap_AllocTemporarySampleCacheEntry = 0x8000DD68;
func_8000DFFC = 0x8000DFFC;
func_8000E1C4 = 0x8000E1C4;
AudioHeap_DiscardSampleCacheEntry = 0x8000DFFC;
AudioHeap_UnapplySampleCache = 0x8000E1C4;
AudioHeap_AllocPersistentSampleCacheEntry = 0x8000E208;
func_8000E290 = 0x8000E290;
AudioHeap_DiscardSampleCaches = 0x8000E290;
func_8000E4A0 = 0x8000E4A0;
func_8000E5A8 = 0x8000E5A8;
func_8000E8E0 = 0x8000E8E0;
func_8000EBB4 = 0x8000EBB4;
func_8000EC14 = 0x8000EC14;
func_8000ECC0 = 0x8000ECC0;
func_8000ED28 = 0x8000ED28;
func_8000EE14 = 0x8000EE14;
func_8000EEE4 = 0x8000EEE4;
func_8000EF48 = 0x8000EF48;
func_8000F010 = 0x8000F010;
func_8000F078 = 0x8000F078;
func_8000F158 = 0x8000F158;
func_8000F200 = 0x8000F200;
func_8000F220 = 0x8000F220;
func_8000F354 = 0x8000F354;
func_8000F388 = 0x8000F388;
func_8000F478 = 0x8000F478;
func_8000F554 = 0x8000F554;
func_8000F790 = 0x8000F790;
func_8000F7CC = 0x8000F7CC;
func_8000F820 = 0x8000F820;
func_8000F864 = 0x8000F864;
func_8000FA28 = 0x8000FA28;
func_8000FB50 = 0x8000FB50;
func_8000FBA8 = 0x8000FBA8;
AudioLoad_DecreaseSampleDmaTtls = 0x8000E4A0;
AudioLoad_DmaSampleData = 0x8000E5A8;
AudioLoad_InitSampleDmaBuffers = 0x8000E8E0;
AudioLoad_InitTable = 0x8000EBB4;
AudioLoad_SyncLoadSeqFonts = 0x8000EC14;
AudioLoad_SyncLoadSeqParts = 0x8000ECC0;
AudioLoad_SyncLoadSample = 0x8000ED28;
AudioLoad_SyncLoadInstrument = 0x8000EE14;
AudioLoad_AsyncLoadSampleBank = 0x8000EEE4;
AudioLoad_AsyncLoadSeq = 0x8000EF48;
AudioLoad_GetFontsForSequence = 0x8000F010;
AudioLoad_DiscardSeqFonts = 0x8000F078;
AudioLoad_DiscardFont = 0x8000F158;
AudioLoad_SyncInitSeqPlayer = 0x8000F200;
AudioLoad_SyncInitSeqPlayerInternal = 0x8000F220;
AudioLoad_SyncLoadSeq = 0x8000F354;
AudioLoad_SyncLoadSampleBank = 0x8000F388;
AudioLoad_SyncLoadFont = 0x8000F478;
AudioLoad_SyncLoad = 0x8000F554;
AudioLoad_GetLoadTableIndex = 0x8000F790;
AudioLoad_SearchCaches = 0x8000F7CC;
AudioLoad_GetLoadTable = 0x8000F820;
AudioLoad_RelocateFont = 0x8000F864;
AudioLoad_SyncDma = 0x8000FA28;
AudioLoad_SyncDmaUnkMedium = 0x8000FB50;
AudioLoad_Dma = 0x8000FBA8;
func_8000FC7C = 0x8000FC7C;
func_8000FC8C = 0x8000FC8C;
func_8000FCA0 = 0x8000FCA0;
func_8000FCC0 = 0x8000FCC0;
func_8000FF9C = 0x8000FF9C;
func_8000FFCC = 0x8000FFCC;
func_800105EC = 0x800105EC;
func_8001079C = 0x8001079C;
func_80010808 = 0x80010808;
func_80010870 = 0x80010870;
func_800109FC = 0x800109FC;
func_80010A80 = 0x80010A80;
func_80010AD8 = 0x80010AD8;
func_80010BF0 = 0x80010BF0;
func_80010C60 = 0x80010C60;
func_80010EFC = 0x80010EFC;
func_80010F8C = 0x80010F8C;
func_80010FE4 = 0x80010FE4;
func_80011120 = 0x80011120;
func_8001154C = 0x8001154C;
func_80011710 = 0x80011710;
func_80011758 = 0x80011758;
AudioLoad_SyncLoadSimple = 0x8000FCA0;
AudioLoad_AsyncLoadInner = 0x8000FCC0;
AudioLoad_ProcessLoads = 0x8000FF9C;
AudioLoad_Init = 0x8000FFCC;
AudioLoad_SlowLoadSample = 0x800105EC;
AudioLoad_GetFontSample = 0x8001079C;
AudioLoad_FinishSlowLoad = 0x80010808;
AudioLoad_ProcessSlowLoads = 0x80010870;
AudioLoad_DmaSlowCopy = 0x800109FC;
AudioLoad_DmaSlowCopyUnkMedium = 0x80010A80;
AudioLoad_StartAsyncLoad = 0x80010AD8;
AudioLoad_ProcessAsyncLoads = 0x80010BF0;
AudioLoad_ProcessAsyncLoad = 0x80010C60;
AudioLoad_AsyncDma = 0x80010EFC;
AudioLoad_AsyncDmaUnkMedium = 0x80010F8C;
AudioLoad_RelocateSample = 0x80010FE4;
AudioLoad_RelocateFontAndPreloadSamples = 0x80011120;
AudioLoad_ProcessSamplePreloads = 0x8001154C;
AudioLoad_AddToSampleSet = 0x80011710;
AudioLoad_GetSamplesForFont = 0x80011758;
func_80011890 = 0x80011890;
func_80011C58 = 0x80011C58;
func_80011D10 = 0x80011D10;
func_80011D4C = 0x80011D4C;
func_80011DFC = 0x80011DFC;
Audio_GetInstrument = 0x80011D4C;
Audio_GetDrum = 0x80011DFC;
func_80011EB8 = 0x80011EB8;
func_80011F4C = 0x80011F4C;
func_80011FA8 = 0x80011FA8;
linker_scripts/us/symbol_addrs_engine.txt
+7
View File
@@ -2,6 +2,8 @@
D_Timer_800CA238 = 0x800CA238;
//fox_std_lib
sSmallChars = 0x800D2660;//type:asciz size:42
Graphics_ClearPrintBuffer = 0x80099980;
Graphics_Printf = 0x800999D8;
Texture_Scroll = 0x80099A2C;
@@ -148,6 +150,8 @@ Message_DisplayScrollingText = 0x800C2D3C;
Message_IsPrintingChar = 0x800C2F30;
// fox_bg
D_800C9DBC = 0x800C9DBC;//size:39
D_800C9D94 = 0x800C9D94;//size:39
D_800C9CC4 = 0x800C9CC4;
D_800C9CF8 = 0x800C9CF8;
@@ -325,6 +329,9 @@ func_8006A06C = 0x8006A06C;
func_8006A38C = 0x8006A38C;
Object_UpdateAll = 0x8006A3E8;
// fox_enmy2
D_800D0DBC = 0x800D0DBC;//size:24
// fox_game
D_80161A10 = 0x80161A10;
D_80161A14 = 0x80161A14;
linker_scripts/us/symbol_addrs_nlib_vars.txt
+1 -1
View File
@@ -135,7 +135,7 @@ gDramStack = 0x80281000; //size:0x400 segment:fox_buffers defined:true
gOSYieldData = 0x80281400; //size:0xC00 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
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
gFillBuffer = 0x8038F080; //size:0x780 segment:fox_buffers defined:true
gFrameBuffers = 0x8038F800; //size:0x70800 segment:fox_buffers defined:true
linker_scripts/us/symbol_addrs_overlays.txt
+2 -1
View File
@@ -22,7 +22,7 @@ func_i2_80187B08 = 0x80187B08;//segment:ovl_i2
func_i2_80188A40 = 0x80188A40;//segment:ovl_i2
D_i2_80195D70 = 0x80195D70;//segment:ovl_i2
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_8019F1C0 = 0x8019F1C0; // type:s32 size:0xA0 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_801A7D98 = 0x801A7D98;//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_801B7608 = 0x801B7608;//segment:ovl_i5
D_i5_801B769C = 0x801B769C;//segment:ovl_i5
src/main/audio_general.c
+1
View File
@@ -1,5 +1,6 @@
#include "sys.h"
#include "sf64audio_provisional.h"
#include "context.h"
void func_80016A50(void) {
}
src/main/audio_heap.c
+346 -346
View File
File diff suppressed because it is too large Load Diff
src/main/audio_load.c
+1269 -156
View File
File diff suppressed because it is too large Load Diff
src/main/audio_playback.c
+2 -2
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_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")
src/main/audio_thread.c
+6 -6
View File
@@ -10,12 +10,12 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E778.s")
void func_8001E7C8(void) {
D_800C7C50 = 0;
D_800C7C54 = 0;
osCreateMesgQueue(D_800C7C58, D_80156600, 1);
osCreateMesgQueue(D_800C7C5C, D_80156608, 4);
osCreateMesgQueue(D_800C7C60, D_80156618, 1);
osCreateMesgQueue(D_800C7C64, D_8015661C, 1);
gThreadCmdWritePos = 0;
gThreadCmdReadPos = 0;
osCreateMesgQueue(gAudioTaskStartQueue, D_80156600, 1);
osCreateMesgQueue(gThreadCmdProcQueue, D_80156608, 4);
osCreateMesgQueue(gAudioUnkQueue, D_80156618, 1);
osCreateMesgQueue(gAudioResetQueue, D_8015661C, 1);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_thread/func_8001E850.s")
src/main/audiotables.c
+122
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,
};
src/main/fox_360.c
+15 -22
View File
@@ -1,13 +1,6 @@
#include "prevent_bss_reordering.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_800C9A9C[4] = {
{ 0.0f, 20000.0f, 0.0f },
@@ -103,7 +96,7 @@ void func_8002E548(void) {
func_8008E51C(D_8015F930, D_8015F944);
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 {
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++;
}
break;
@@ -214,7 +207,7 @@ void func_8002E700(Player* player) {
player->unk_0D0 = D_80161A54;
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;
case 4:
@@ -389,12 +382,12 @@ void func_8002F180(void) {
}
actor->iwork[11] = 1;
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.unk_1C = 0.0f;
actor->info.bonus = 0;
} 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);
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 {
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.y = -500.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;
} else {
newActor->obj.pos.x = 0.0f;
@@ -868,7 +861,7 @@ void func_8003088C(Actor* actor) {
actor->obj.status = OBJ_DYING;
actor->fwork[23] = 0.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_0BE = 0;
actor->timer_04C = RAND_INT(2.9f);
@@ -978,16 +971,16 @@ void func_8003088C(Actor* actor) {
break;
}
} else {
D_801515F0[actor->unk_0D4].unk_00 = 80;
gActors[actor->unk_0D4 - 101].iwork[1] = 80;
}
} else {
D_801515F0[actor->unk_0D4].unk_00 = 80;
gActors[actor->unk_0D4 - 101].iwork[1] = 80;
}
break;
}
} else {
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[18] = 5;
actor->iwork[8] = 15;
@@ -1003,9 +996,9 @@ void func_8003088C(Actor* actor) {
actor->iwork[8] = 20;
}
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) {
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);
if (actor->unk_0E4 < 100) {
@@ -1337,7 +1330,7 @@ void func_800319AC(Actor* this) {
this->fwork[29] = 5.0f;
this->fwork[7] = 360.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;
}
gTeamShields[this->unk_0E4] = -1;
src/main/fox_beam.c
+4 -4
View File
@@ -705,7 +705,7 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) {
shot->obj.pos.z += shot->vel.z * 5.0f;
actor->timer_0C2 = 3;
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);
}
} else {
@@ -852,7 +852,7 @@ void func_80038140(PlayerShot* shot) {
shot->obj.pos.y += 2.0f * shot->vel.y;
shot->obj.pos.z += 2.0f * shot->vel.z;
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);
} else {
func_80036318(shot);
@@ -953,7 +953,7 @@ void func_80038140(PlayerShot* shot) {
} else {
boss->dmgType = DMG_BEAM;
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 {
@@ -967,7 +967,7 @@ void func_80038140(PlayerShot* shot) {
} else {
boss->dmgType = DMG_BEAM;
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);
}
}
src/main/fox_buffers.c
+1 -1
View File
@@ -4,7 +4,7 @@ u64 gDramStack[SP_DRAM_STACK_SIZE64];
u8 gOSYieldData[OS_YIELD_DATA_SIZE];
FrameBuffer gZBuffer; // z buffer
u8 gTaskOutputBuffer[0x30000];
u8 gAudioDataBuffer[0xB0000];
u8 gAudioHeap[0xB0000];
u16 gTextureRenderBuffer[0x3C40];
u16 gFillBuffer[3 * SCREEN_WIDTH];
FrameBuffer gFrameBuffers[3];
src/main/fox_demo.c
+22 -20
View File
@@ -194,12 +194,12 @@ void func_80048CC4(Actor* actor, s32 arg1) {
Object_SetInfo(&actor->info, actor->obj.id);
if (arg1 == 3) {
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x11030010U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
Audio_PlaySfx(0x31024059U, actor->sfxPos, 0, &gDefaultScale, &gDefaultScale, &gDefaultReverb);
actor->unk_0B6 = 1;
} else {
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;
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_190 = 5.0f;
@@ -377,7 +377,7 @@ void func_80049630(Actor* actor) {
case 1:
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->fwork[29] = 5.0f;
@@ -431,7 +431,7 @@ void func_80049968(Actor* actor, s32 arg1) {
actor->vel.z = gPlayer[0].vel.z;
Object_SetInfo(&actor->info, actor->obj.id);
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) {
@@ -560,22 +560,22 @@ void func_80049C0C(Player* player) {
if ((player->timer_1F8 == 0x5F) && (gTeamShields[1] > 0)) {
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)) {
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)) {
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) {
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(0x113200FF);
}
@@ -608,7 +608,7 @@ void func_80049C0C(Player* player) {
player->unk_234 = 1;
D_8017827C = 1;
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();
}
}
@@ -757,7 +757,7 @@ void func_8004A700(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_800CA074[arg1];
actor->iwork[11] = 1;
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) {
@@ -885,11 +885,11 @@ void func_8004AAF4(Player* player) {
}
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) {
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) {
@@ -899,7 +899,7 @@ void func_8004AAF4(Player* player) {
player->unk_194 = 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;
@@ -1964,7 +1964,7 @@ void func_8004E4D4(Actor* actor) {
actor->state = 2;
actor->timer_0BC = 0x32;
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;
/* fallthrough */
@@ -1986,7 +1986,7 @@ void func_8004E4D4(Actor* actor) {
actor->state = 0xB;
actor->timer_0BC = 0x96;
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;
/* fallthrough */
case 11:
@@ -2041,7 +2041,7 @@ void func_8004E4D4(Actor* actor) {
break;
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->fwork[29] = 5.0f;
/* fallthrough */
@@ -2198,7 +2198,8 @@ void func_8004F05C(Actor* actor) {
case 1:
actor->state = 2;
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;
case 2:
@@ -2417,7 +2418,8 @@ void func_8004F8AC(Actor* actor) {
actor->state = 1;
actor->timer_0BC = 0x32;
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;

Some files were not shown because too many files have changed in this diff Show More