Merge remote-tracking branch 'upstream/master' into play

This commit is contained in:
Derek Hensley
2022-10-04 17:38:41 -07:00
315 changed files with 13597 additions and 6414 deletions
+63 -63
View File
@@ -2220,11 +2220,11 @@
0x801D57B4:("gDefaultShortNoteVelocityTable","UNK_TYPE1","",0x1),
0x801D57C4:("gDefaultShortNoteGateTimeTable","UNK_TYPE1","",0x1),
0x801D57D4:("gDefaultEnvelope","UNK_TYPE1","",0x1),
0x801D57E4:("gZeroNoteSub","UNK_TYPE4","",0x4),
0x801D5804:("gDefaultNoteSub","UNK_TYPE4","",0x4),
0x801D5824:("gHeadsetPanQuantization","u16","[64]",0x80),
0x801D57E4:("gZeroedSampleState","UNK_TYPE4","",0x4),
0x801D5804:("gDefaultSampleState","UNK_TYPE4","",0x4),
0x801D5824:("gHaasEffectDelaySize","u16","[64]",0x80),
0x801D58A4:("D_801D58A4","s32","",0x4),
0x801D58A8:("D_801D58A8","s16","[64]",0x80),
0x801D58A8:("gInvalidAdpcmCodeBook","s16","[64]",0x80),
0x801D5928:("gHeadsetPanVolume","f32","[128]",0x200),
0x801D5B28:("gStereoPanVolume","f32","[128]",0x200),
0x801D5D28:("gDefaultPanVolume","f32","[128]",0x200),
@@ -2280,11 +2280,11 @@
0x801D66B8:("sAudioEnvReverb","UNK_TYPE1","",0x1),
0x801D66BC:("sAudioCodeReverb","UNK_TYPE1","",0x1),
0x801D66C0:("sPrevSeqMode","UNK_TYPE1","",0x1),
0x801D66C4:("sAudioEnemyDist","f32","",0x4),
0x801D66C8:("sAudioEnemyVol","UNK_TYPE1","",0x1),
0x801D66C4:("sBgmEnemyDist","f32","",0x4),
0x801D66C8:("sBgmEnemyVolume","UNK_TYPE1","",0x1),
0x801D66CC:("sPrevMainBgmSeqId","UNK_TYPE2","",0x2),
0x801D66D0:("sBgmPlayerIOPort7","UNK_TYPE1","",0x1),
0x801D66D4:("sSceneSeqId2","UNK_TYPE1","",0x1),
0x801D66D0:("sSeqResumePoint","UNK_TYPE1","",0x1),
0x801D66D4:("sPrevSceneSeqId","UNK_TYPE1","",0x1),
0x801D66D8:("sNumFramesStill","UNK_TYPE4","",0x4),
0x801D66DC:("sNumFramesMoving","UNK_TYPE4","",0x4),
0x801D66E0:("sAudioBaseFilter","UNK_TYPE1","",0x1),
@@ -2297,7 +2297,7 @@
0x801D66FC:("sObjSoundMainBgmSeqId","UNK_TYPE1","",0x1),
0x801D6700:("sSeqFlags","UNK_TYPE1","",0x1),
0x801D6780:("sSpecReverbs","UNK_TYPE1","",0x1),
0x801D6794:("sNatureAmbienceData","UNK_TYPE1","",0x1),
0x801D6794:("sAmbienceData","UNK_TYPE1","",0x1),
0x801D6FB4:("sIsOcarinaInputEnabled","UNK_TYPE1","",0x1),
0x801D6FB8:("sOcarinaInstrumentId","UNK_TYPE1","",0x1),
0x801D6FBC:("sCurOcarinaPitch","UNK_TYPE1","",0x1),
@@ -2411,7 +2411,7 @@
0x801DB870:("D_801DB870","UNK_TYPE1","",0x1),
0x801DB8B8:("D_801DB8B8","UNK_TYPE1","",0x1),
0x801DB900:("D_801DB900","UNK_TYPE1","",0x1),
0x801DB930:("D_801DB930","UNK_PTR","",0x4),
0x801DB930:("gReverbSettingsTable","UNK_PTR","",0x4),
0x801DB958:("gAudioSpecs","AudioSpec","[21]",0x498),
0x801DBDF0:("D_801DBDF0","f32","",0x4),
0x801DBDF4:("jtbl_801DBDF4","UNK_PTR","",0x4),
@@ -4015,7 +4015,7 @@
0x801F59F4:("D_801F59F4","UNK_TYPE1","",0x1),
0x801F59F8:("D_801F59F8","UNK_TYPE1","",0x1),
0x801F5A00:("sQuakeRequest","QuakeRequest","[4]",0x90),
0x801F5A90:("sDistortionContext","DistortionContext","",0xc),
0x801F5A90:("sDistortionRequest","DistortionRequest","",0xc),
0x801F5AA0:("sMatAnimStep","s32","",0x4),
0x801F5AA4:("sMatAnimFlags","u32","",0x4),
0x801F5AA8:("sMatAnimAlphaRatio","f32","",0x4),
@@ -4046,8 +4046,8 @@
0x801F6B34:("sPlayerCallDestroyFunc","UNK_TYPE1","",0x1),
0x801F6B38:("sPlayerCallUpdateFunc","UNK_TYPE1","",0x1),
0x801F6B3C:("sPlayerCallDrawFunc","UNK_TYPE1","",0x1),
0x801F6B40:("gShrinkWindowContext","ShrinkWindowContext","",0x4),
0x801F6B44:("gShrinkWindowContextPtr","ShrinkWindowContext*","",0x4),
0x801F6B40:("sShrinkWindow","ShrinkWindow","",0x4),
0x801F6B44:("sShrinkWindowPtr","ShrinkWindow*","",0x4),
0x801F6B50:("D_801F6B50","UNK_TYPE4","",0x4),
0x801F6B58:("D_801F6B58","UNK_TYPE1","",0x1),
0x801F6BF0:("sKaleidoAreaFaultClient","FaultAddrConvClient","",0xC),
@@ -4255,14 +4255,14 @@
0x801FD294:("sSfxVolumeCur","UNK_TYPE1","",0x1),
0x801FD298:("sSfxVolumeTarget","UNK_TYPE1","",0x1),
0x801FD29C:("sSfxVolumeRate","UNK_TYPE1","",0x1),
0x801FD2A0:("sSceneSeqId1","UNK_TYPE1","",0x1),
0x801FD2A0:("sRequestedSceneSeqId","UNK_TYPE1","",0x1),
0x801FD2A8:("sSfxChannelState","UNK_TYPE1","",0x1),
0x801FD3A8:("D_801FD3A8","UNK_TYPE1","",0x1),
0x801FD3A9:("D_801FD3A9","UNK_TYPE1","",0x1),
0x801FD3AA:("sRiverSoundBgmTimer","UNK_TYPE1","",0x1),
0x801FD3AB:("sFanfareState","UNK_TYPE1","",0x1),
0x801FD3AC:("sFanfareSeqId","UNK_TYPE1","",0x1),
0x801FD3AE:("sMuteOnlySfxAndNatureSeq","UNK_TYPE1","",0x1),
0x801FD3AE:("sMuteOnlySfxAndAmbienceSeq","UNK_TYPE1","",0x1),
0x801FD3AF:("sAllPlayersMutedExceptOcaAndSys","UNK_TYPE1","",0x1),
0x801FD3B0:("sAudioPauseState","UNK_TYPE1","",0x1),
0x801FD3B4:("sSpatialSeqIsActive","u8","[4]",0x4),
@@ -4288,7 +4288,7 @@
0x801FD434:("D_801FD434","UNK_TYPE1","",0x1),
0x801FD435:("sSpatialSeqPlayerIndex","UNK_TYPE1","",0x1),
0x801FD436:("sSpatialSeqFadeTimer","UNK_TYPE1","",0x1),
0x801FD438:("D_801FD438","UNK_TYPE1","",0x1),
0x801FD438:("sPrevAmbienceSeqId","UNK_TYPE1","",0x1),
0x801FD43A:("sPlayingStaff","OcarinaStaff","",0x3),
0x801FD43E:("sPlaybackStaff","OcarinaStaff","",0x3),
0x801FD442:("sRecordingStaff","OcarinaStaff","",0x3),
@@ -4346,7 +4346,7 @@
0x8020001E:("D_8020001E","UNK_TYPE1","",0x1),
0x802000C9:("D_802000C9","UNK_TYPE1","",0x1),
0x802000D4:("D_802000D4","UNK_TYPE1","",0x1),
0x80200140:("D_80200140","UNK_TYPE1","",0x1),
0x80200140:("gActiveSeqs","UNK_TYPE1","",0x1),
0x8020034A:("D_8020034A","UNK_TYPE1","",0x1),
0x80200B88:("D_80200B88","UNK_TYPE1","",0x1),
0x80200BBA:("D_80200BBA","UNK_TYPE1","",0x1),
@@ -4354,10 +4354,10 @@
0x80200BCE:("D_80200BCE","UNK_TYPE1","",0x1),
0x80200BD0:("D_80200BD0","UNK_TYPE1","",0x1),
0x80200C70:("gAudioContext","AudioContext","",0x81F8),
0x80208E68:("D_80208E68","UNK_TYPE4","",0x4),
0x80208E6C:("D_80208E6C","UNK_TYPE4","",0x4),
0x80208E70:("D_80208E70","UNK_TYPE4","",0x4),
0x80208E74:("D_80208E74","UNK_TYPE4","",0x4),
0x80208E68:("gCustomAudioUpdateFunction","UNK_TYPE4","",0x4),
0x80208E6C:("gCustomAudioSeqFunction","UNK_TYPE4","",0x4),
0x80208E70:("gCustomAudioReverbFunction","UNK_TYPE4","",0x4),
0x80208E74:("gCustomAudioSynthFunction","UNK_TYPE4","",0x4),
0x80208E90:("sJpegBitStreamPtr","UNK_TYPE1","",0x1),
0x80208E94:("sJpegBitStreamByteIdx","UNK_TYPE1","",0x1),
0x80208E98:("sJpegBitStreamBitIdx","UNK_TYPE1","",0x1),
@@ -4725,15 +4725,15 @@
0x8082B5CC:("D_8082B5CC","UNK_TYPE1","",0x1),
0x8082B5E0:("D_8082B5E0","UNK_TYPE1","",0x1),
0x8082B5F4:("D_8082B5F4","UNK_TYPE2","",0x2),
0x8082B600:("D_8082B600","UNK_TYPE2","",0x2),
0x8082B604:("D_8082B604","UNK_TYPE2","",0x2),
0x8082B608:("D_8082B608","UNK_TYPE2","",0x2),
0x8082B60C:("D_8082B60C","UNK_TYPE1","",0x1),
0x8082B684:("D_8082B684","UNK_TYPE2","",0x2),
0x8082B6CC:("D_8082B6CC","UNK_TYPE1","",0x1),
0x8082B6D4:("D_8082B6D4","UNK_TYPE1","",0x1),
0x8082B6DC:("D_8082B6DC","UNK_TYPE1","",0x1),
0x8082B6E4:("D_8082B6E4","UNK_TYPE2","",0x2),
0x8082B600:("sMaskEquipState","UNK_TYPE2","",0x2),
0x8082B604:("sMaskEquipMagicArrowSlotHoldTimer","UNK_TYPE2","",0x2),
0x8082B608:("sMaskEquipAnimTimer","UNK_TYPE2","",0x2),
0x8082B60C:("gMaskPlayerFormSlotRestrictions","UNK_TYPE1","",0x1),
0x8082B684:("sMasksGivenOnMoonBits","UNK_TYPE2","",0x2),
0x8082B6CC:("sMaskPlayerFormItems","UNK_TYPE1","",0x1),
0x8082B6D4:("sMaskCButtonPosX","UNK_TYPE1","",0x1),
0x8082B6DC:("sMaskCButtonPosY","UNK_TYPE1","",0x1),
0x8082B6E4:("sMaskEquipMagicArrowBowSlotHoldTimer","UNK_TYPE2","",0x2),
0x8082B6F0:("sPromptAlphaTargets","UNK_TYPE1","",0x1),
0x8082B6F4:("sPromptAlphaTargetIndex","UNK_TYPE2","",0x2),
0x8082B6F8:("sPromptAlphaTimer","UNK_TYPE2","",0x2),
@@ -11112,15 +11112,15 @@
0x80A2BBF4:("D_80A2BBF4","UNK_TYPE1","",0x1),
0x80A2BBF5:("D_80A2BBF5","UNK_TYPE1","",0x1),
0x80A2CA90:("En_Syateki_Dekunuts_InitVars","UNK_TYPE1","",0x1),
0x80A2CAB0:("D_80A2CAB0","UNK_TYPE1","",0x1),
0x80A2CADC:("D_80A2CADC","UNK_TYPE4","",0x4),
0x80A2CAE8:("D_80A2CAE8","UNK_PTR","",0x4),
0x80A2CB90:("D_80A2CB90","UNK_TYPE1","",0x1),
0x80A2CB9C:("D_80A2CB9C","UNK_TYPE4","",0x4),
0x80A2CBA0:("D_80A2CBA0","UNK_TYPE1","",0x1),
0x80A2CBAC:("D_80A2CBAC","UNK_TYPE1","",0x1),
0x80A2CBB8:("D_80A2CBB8","UNK_TYPE1","",0x1),
0x80A2CBBC:("D_80A2CBBC","UNK_TYPE1","",0x1),
0x80A2CAB0:("sCylinderInit","UNK_TYPE1","",0x1),
0x80A2CADC:("sBonusDekuScrubColliderDimensions","UNK_TYPE4","",0x4),
0x80A2CAE8:("sAnimationInfo","UNK_PTR","",0x4),
0x80A2CB90:("sInitChain","UNK_TYPE1","",0x1),
0x80A2CB9C:("sDrawFlowers","UNK_TYPE4","",0x4),
0x80A2CBA0:("sVelocity","UNK_TYPE1","",0x1),
0x80A2CBAC:("sAccel","UNK_TYPE1","",0x1),
0x80A2CBB8:("sPrimColor","UNK_TYPE1","",0x1),
0x80A2CBBC:("sEnvColor","UNK_TYPE1","",0x1),
0x80A2CBC0:("D_80A2CBC0","f32","",0x4),
0x80A2D1C0:("Elf_Msg3_InitVars","UNK_TYPE1","",0x1),
0x80A2D1E0:("D_80A2D1E0","UNK_TYPE1","",0x1),
@@ -11517,18 +11517,18 @@
0x80A452A4:("D_80A452A4","UNK_TYPE1","",0x1),
0x80A452B0:("D_80A452B0","UNK_TYPE4","",0x4),
0x80A48B30:("En_Wiz_InitVars","UNK_TYPE1","",0x1),
0x80A48B50:("D_80A48B50","UNK_TYPE1","",0x1),
0x80A48CB8:("D_80A48CB8","UNK_PTR","",0x4),
0x80A48CC8:("D_80A48CC8","UNK_TYPE1","",0x1),
0x80A48CF4:("D_80A48CF4","UNK_TYPE1","",0x1),
0x80A48D14:("D_80A48D14","UNK_TYPE1","",0x1),
0x80A48D34:("D_80A48D34","UNK_TYPE1","",0x1),
0x80A48D4C:("D_80A48D4C","UNK_TYPE1","",0x1),
0x80A48D54:("D_80A48D54","UNK_TYPE4","",0x4),
0x80A48D60:("D_80A48D60","UNK_TYPE1","",0x1),
0x80A48D64:("D_80A48D64","UNK_TYPE1","",0x1),
0x80A48D68:("D_80A48D68","UNK_TYPE4","",0x4),
0x80A48D74:("D_80A48D74","UNK_TYPE4","",0x4),
0x80A48B50:("sJntSphElementsInit","UNK_TYPE1","",0x1),
0x80A48CB8:("sJntSphInit","UNK_PTR","",0x4),
0x80A48CC8:("sCylinderInit","UNK_TYPE1","",0x1),
0x80A48CF4:("sFireWizrobeDamageTable","UNK_TYPE1","",0x1),
0x80A48D14:("sIceWizrobeDamageTable","UNK_TYPE1","",0x1),
0x80A48D34:("sAnimations","UNK_TYPE1","",0x1),
0x80A48D4C:("sAnimationModes","UNK_TYPE1","",0x1),
0x80A48D54:("staffTargetFlameScale","UNK_TYPE4","",0x4),
0x80A48D60:("sDustPrimColor","UNK_TYPE1","",0x1),
0x80A48D64:("sDustEnvTimer","UNK_TYPE1","",0x1),
0x80A48D68:("staffFlamePos","UNK_TYPE4","",0x4),
0x80A48D74:("staffFlamePos","UNK_TYPE4","",0x4),
0x80A48D80:("jtbl_80A48D80","UNK_PTR","",0x4),
0x80A48D98:("D_80A48D98","f32","",0x4),
0x80A48D9C:("D_80A48D9C","f32","",0x4),
@@ -11556,15 +11556,15 @@
0x80A495F8:("D_80A495F8","f32","",0x4),
0x80A495FC:("D_80A495FC","f32","",0x4),
0x80A49600:("D_80A49600","f32","",0x4),
0x80A4C1C0:("D_80A4C1C0","UNK_TYPE4","",0x4),
0x80A4C1C0:("sPoolHitByIceArrow","UNK_TYPE4","",0x4),
0x80A4C1C4:("En_Wiz_Fire_InitVars","UNK_TYPE1","",0x1),
0x80A4C1E4:("D_80A4C1E4","UNK_TYPE1","",0x1),
0x80A4C210:("D_80A4C210","UNK_TYPE4","",0x4),
0x80A4C21C:("D_80A4C21C","UNK_TYPE4","",0x4),
0x80A4C228:("D_80A4C228","UNK_TYPE4","",0x4),
0x80A4C234:("D_80A4C234","UNK_TYPE1","",0x1),
0x80A4C24C:("D_80A4C24C","UNK_TYPE1","",0x1),
0x80A4C250:("D_80A4C250","UNK_TYPE1","",0x1),
0x80A4C234:("lightSettingsColors","UNK_TYPE1","",0x1),
0x80A4C24C:("sSteamPrimColor","UNK_TYPE1","",0x1),
0x80A4C250:("sSteamEnvColor","UNK_TYPE1","",0x1),
0x80A4C260:("jtbl_80A4C260","UNK_PTR","",0x4),
0x80A4C274:("D_80A4C274","f32","",0x4),
0x80A4C278:("D_80A4C278","f32","",0x4),
@@ -12095,12 +12095,12 @@
0x80A70510:("jtbl_80A70510","UNK_PTR","",0x4),
0x80A7056C:("jtbl_80A7056C","UNK_PTR","",0x4),
0x80A71080:("Bg_Crace_Movebg_InitVars","UNK_TYPE1","",0x1),
0x80A710A0:("D_80A710A0","UNK_TYPE1","",0x1),
0x80A710A4:("D_80A710A4","UNK_TYPE1","",0x1),
0x80A710A8:("D_80A710A8","UNK_TYPE1","",0x1),
0x80A710AC:("D_80A710AC","UNK_TYPE1","",0x1),
0x80A710A0:("sHasInitializedIsLoaded","UNK_TYPE1","",0x1),
0x80A710A4:("sLoadedDoorCount","UNK_TYPE1","",0x1),
0x80A710A8:("sInitChain","UNK_TYPE1","",0x1),
0x80A710AC:("sUnitVecZ","UNK_TYPE1","",0x1),
0x80A710C0:("D_80A710C0","f32","",0x4),
0x80A711B0:("D_80A711B0","UNK_TYPE1","",0x1),
0x80A711B0:("sIsLoaded","UNK_TYPE1","",0x1),
0x80A739A0:("D_80A739A0","UNK_PTR","",0x4),
0x80A73AE0:("En_Dno_InitVars","UNK_TYPE1","",0x1),
0x80A73B00:("D_80A73B00","UNK_TYPE1","",0x1),
@@ -12869,9 +12869,9 @@
0x80AC1E00:("D_80AC1E00","f32","",0x4),
0x80AC1E04:("D_80AC1E04","f32","",0x4),
0x80AC2580:("En_Door_Etc_InitVars","UNK_TYPE1","",0x1),
0x80AC25A0:("D_80AC25A0","UNK_TYPE1","",0x1),
0x80AC25CC:("D_80AC25CC","UNK_TYPE2","",0x2),
0x80AC2634:("D_80AC2634","UNK_TYPE1","",0x1),
0x80AC25A0:("sCylinderInit","UNK_TYPE1","",0x1),
0x80AC25CC:("sObjInfo","UNK_TYPE2","",0x2),
0x80AC2634:("sInitChain","UNK_TYPE1","",0x1),
0x80AC2650:("D_80AC2650","f32","",0x4),
0x80AC4510:("En_Bigokuta_InitVars","UNK_TYPE1","",0x1),
0x80AC4530:("D_80AC4530","UNK_TYPE1","",0x1),