mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-08 20:19:53 -04:00
Merge remote-tracking branch 'upstream/master' into play
This commit is contained in:
+14
-32
@@ -1471,9 +1471,7 @@ extern KaleidoMgrOverlay* gKaleidoMgrCurOvl;
|
||||
// extern UNK_TYPE4 D_801D0BB0;
|
||||
// extern UNK_TYPE1 D_801D0C80;
|
||||
// extern UNK_TYPE1 D_801D0CB0;
|
||||
extern const TransitionInit TransitionFade_InitVars;
|
||||
// extern UNK_TYPE1 D_801D0D00;
|
||||
extern const TransitionInit TransitionCircle_InitVars;
|
||||
extern Gfx D_801D0D00[];
|
||||
extern s32 gDbgCamEnabled;
|
||||
// extern UNK_TYPE1 D_801D0D54;
|
||||
// extern UNK_TYPE2 sQuakeIndex;
|
||||
@@ -1557,11 +1555,11 @@ extern f32 gPitchFrequencies[];
|
||||
extern u8 gDefaultShortNoteVelocityTable[];
|
||||
extern u8 gDefaultShortNoteGateTimeTable[];
|
||||
extern EnvelopePoint gDefaultEnvelope[];
|
||||
extern NoteSubEu gZeroNoteSub;
|
||||
extern NoteSubEu gDefaultNoteSub;
|
||||
extern u16 gHeadsetPanQuantization[];
|
||||
extern u16 gHeadsetPanQuantization[];
|
||||
extern s16 D_801D58A8[];
|
||||
extern NoteSampleState gZeroedSampleState;
|
||||
extern NoteSampleState gDefaultSampleState;
|
||||
extern u16 gHaasEffectDelaySize[];
|
||||
extern u16 gHaasEffectDelaySize[];
|
||||
extern s16 gInvalidAdpcmCodeBook[];
|
||||
extern f32 gHeadsetPanVolume[];
|
||||
extern f32 gStereoPanVolume[];
|
||||
extern f32 gDefaultPanVolume[];
|
||||
@@ -1721,21 +1719,7 @@ extern s8 gSfxDefaultReverb;
|
||||
extern u8 gAudioSpecId;
|
||||
// extern UNK_TYPE1 D_801DB4D8;
|
||||
// extern UNK_TYPE4 D_801DB4DC;
|
||||
// extern UNK_TYPE1 D_801DB4E0;
|
||||
// extern UNK_TYPE1 D_801DB528;
|
||||
// extern UNK_TYPE1 D_801DB570;
|
||||
// extern UNK_TYPE1 D_801DB5B8;
|
||||
// extern UNK_TYPE1 D_801DB600;
|
||||
// extern UNK_TYPE1 D_801DB648;
|
||||
// extern UNK_TYPE1 D_801DB690;
|
||||
// extern UNK_TYPE1 D_801DB6D8;
|
||||
// extern UNK_TYPE1 D_801DB720;
|
||||
// extern UNK_TYPE1 D_801DB750;
|
||||
// extern UNK_TYPE1 D_801DB798;
|
||||
// extern UNK_TYPE1 D_801DB870;
|
||||
// extern UNK_TYPE1 D_801DB8B8;
|
||||
// extern UNK_TYPE1 D_801DB900;
|
||||
extern UNK_PTR D_801DB930;
|
||||
extern ReverbSettings* gReverbSettingsTable[];
|
||||
extern AudioSpec gAudioSpecs[21];
|
||||
|
||||
// rodata
|
||||
@@ -2717,7 +2701,7 @@ extern f32 D_801DE860;
|
||||
extern f32 D_801DE864;
|
||||
extern f32 D_801DE868;
|
||||
extern f32 D_801DE884;
|
||||
extern TexturePtr gCircleTex;
|
||||
extern TexturePtr gCircleTex[];
|
||||
extern f32 D_801DF090;
|
||||
extern f32 D_801DF094;
|
||||
extern f32 D_801DF0A0;
|
||||
@@ -3181,8 +3165,6 @@ extern s16 D_801F4E7A;
|
||||
// extern UNK_TYPE1 D_801F6B1E;
|
||||
// extern UNK_TYPE1 D_801F6B20;
|
||||
// extern UNK_TYPE1 D_801F6B22;
|
||||
extern ShrinkWindowContext gShrinkWindowContext;
|
||||
extern ShrinkWindowContext* gShrinkWindowContextPtr;
|
||||
// extern UNK_TYPE4 D_801F6B50;
|
||||
// extern UNK_TYPE1 D_801F6B58;
|
||||
extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
|
||||
@@ -3416,7 +3398,7 @@ extern s32 D_801FD120;
|
||||
// extern UNK_TYPE1 D_801FD434;
|
||||
// extern UNK_TYPE1 D_801FD435;
|
||||
// extern UNK_TYPE1 D_801FD436;
|
||||
// extern UNK_TYPE1 D_801FD438;
|
||||
// extern UNK_TYPE1 sPrevAmbienceSeqId;
|
||||
// extern UNK_TYPE1 D_801FD43A;
|
||||
// extern UNK_TYPE1 D_801FD43B;
|
||||
// extern UNK_TYPE1 D_801FD43E;
|
||||
@@ -3477,7 +3459,7 @@ extern ActiveSfx gActiveSfx[7][3];
|
||||
// extern UNK_TYPE1 D_8020001E;
|
||||
// extern UNK_TYPE1 D_802000C9;
|
||||
// extern UNK_TYPE1 D_802000D4;
|
||||
// extern UNK_TYPE1 D_80200140;
|
||||
extern ActiveSequence gActiveSeqs[];
|
||||
// extern UNK_TYPE1 D_8020034A;
|
||||
// extern UNK_TYPE1 D_80200B88;
|
||||
// extern UNK_TYPE1 D_80200BBA;
|
||||
@@ -3485,10 +3467,10 @@ extern ActiveSfx gActiveSfx[7][3];
|
||||
// extern UNK_TYPE1 D_80200BCE;
|
||||
// extern UNK_TYPE1 D_80200BD0;
|
||||
extern AudioContext gAudioContext; // at 0x80200C70
|
||||
extern void (*D_80208E68)(void);
|
||||
extern u32 (*D_80208E6C)(s8 value, SequenceChannel* channel);
|
||||
extern s32 (*D_80208E70)(Sample*, s32, s8, s32);
|
||||
extern Acmd* (*D_80208E74)(Acmd*, s32, s32);
|
||||
extern void (*gCustomAudioUpdateFunction)(void);
|
||||
extern u32 (*gCustomAudioSeqFunction)(s8 value, SequenceChannel* channel);
|
||||
extern s32 (*gCustomAudioReverbFunction)(Sample*, s32, s8, s32);
|
||||
extern Acmd* (*gCustomAudioSynthFunction)(Acmd*, s32, s32);
|
||||
|
||||
// post-code buffers
|
||||
extern u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE];
|
||||
|
||||
Reference in New Issue
Block a user