diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index 3941a51c..c7666889 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -164,14 +164,39 @@ game/gamework.c: .rodata start:0x8011DD30 end:0x8011DD50 .bss start:0x8018FC10 end:0x80190008 -game/ovllist.c: - .data start:0x8012F790 end:0x80130100 +game/objsysobj.c: + .text start:0x800315BC end:0x80031DB4 + .bss start:0x80190008 end:0x801901E0 + .sbss start:0x801D3D00 end:0x801D3D08 + .sdata2 start:0x801D4CA0 end:0x801D4CB0 + +game/objdll.c: + .text start:0x80031DB4 end:0x800325F4 + .data start:0x8012E4F0 end:0x8012E988 + .bss start:0x801901E0 end:0x80190230 + .sbss start:0x801D3D08 end:0x801D3D10 game/frand.c: .text start:0x800325F4 end:0x80032830 .sbss start:0x801D3D10 end:0x801D3D18 .sdata2 start:0x801D4CB0 end:0x801D4CC0 +game/audio.c: + .text start:0x80032830 end:0x80033EEC + .data start:0x8012E988 end:0x8012F130 + .bss start:0x80190230 end:0x80190450 + .sdata start:0x801D34B0 end:0x801D34B8 + .sbss start:0x801D3D18 end:0x801D3D48 + .sdata2 start:0x801D4CC0 end:0x801D4CD0 + +game/EnvelopeExec.c: + .text start:0x80033EEC end:0x800353AC + .sbss start:0x801D3D48 end:0x801D3D78 + .sdata2 start:0x801D4CD0 end:0x801D4CE8 + +game/ovllist.c: + .data start:0x8012F790 end:0x80130100 + game/window.c: .text start:0x8004207C end:0x800483A0 .data start:0x80130140 end:0x80130688 diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index f310fa6a..431179a9 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -593,57 +593,57 @@ frand = .text:0x800325F4; // type:function size:0xAC frandf = .text:0x800326A0; // type:function size:0xD8 frandmod = .text:0x80032778; // type:function size:0xB8 HuAudInit = .text:0x80032830; // type:function size:0x170 -fn_800329A0 = .text:0x800329A0; // type:function size:0x8 -fn_800329A8 = .text:0x800329A8; // type:function size:0x3C -fn_800329E4 = .text:0x800329E4; // type:function size:0x24 -fn_80032A08 = .text:0x80032A08; // type:function size:0x24 -fn_80032A2C = .text:0x80032A2C; // type:function size:0x4 -fn_80032A30 = .text:0x80032A30; // type:function size:0x28 -fn_80032A58 = .text:0x80032A58; // type:function size:0x3C +HuAudStreamPlay = .text:0x800329A0; // type:function size:0x8 +HuAudStreamVolSet = .text:0x800329A8; // type:function size:0x3C +HuAudStreamPauseOn = .text:0x800329E4; // type:function size:0x24 +HuAudStreamPauseOff = .text:0x80032A08; // type:function size:0x24 +HuAudStreamFadeOut = .text:0x80032A2C; // type:function size:0x4 +HuAudAllStop = .text:0x80032A30; // type:function size:0x28 +HuAudFadeOut = .text:0x80032A58; // type:function size:0x3C HuAudFXPlay = .text:0x80032A94; // type:function size:0x80 HuAudFXPlayVol = .text:0x80032B14; // type:function size:0x48 HuAudFXPlayVolPan = .text:0x80032B5C; // type:function size:0x68 -fn_80032BC4 = .text:0x80032BC4; // type:function size:0x2C -fn_80032BF0 = .text:0x80032BF0; // type:function size:0x28 -fn_80032C18 = .text:0x80032C18; // type:function size:0x30 -fn_80032C48 = .text:0x80032C48; // type:function size:0x50 -fn_80032C98 = .text:0x80032C98; // type:function size:0xA4 -fn_80032D3C = .text:0x80032D3C; // type:function size:0x134 -fn_80032E70 = .text:0x80032E70; // type:function size:0x3C -fn_80032EAC = .text:0x80032EAC; // type:function size:0x6C -fn_80032F18 = .text:0x80032F18; // type:function size:0x64 +HuAudFXStop = .text:0x80032BC4; // type:function size:0x2C +HuAudFXAllStop = .text:0x80032BF0; // type:function size:0x28 +HuAudFXFadeOut = .text:0x80032C18; // type:function size:0x30 +HuAudFXPanning = .text:0x80032C48; // type:function size:0x50 +HuAudFXListnerSet = .text:0x80032C98; // type:function size:0xA4 +HuAudFXListnerSetEX = .text:0x80032D3C; // type:function size:0x134 +HuAudFXListnerUpdate = .text:0x80032E70; // type:function size:0x3C +HuAudFXEmiterPlay = .text:0x80032EAC; // type:function size:0x6C +HuAudFXEmiterUpDate = .text:0x80032F18; // type:function size:0x64 HuAudFXListnerKill = .text:0x80032F7C; // type:function size:0x20 -fn_80032F9C = .text:0x80032F9C; // type:function size:0x2C -fn_80032FC8 = .text:0x80032FC8; // type:function size:0x28 -fn_80032FF0 = .text:0x80032FF0; // type:function size:0x54 -fn_80033044 = .text:0x80033044; // type:function size:0x58 -fn_8003309C = .text:0x8003309C; // type:function size:0x5C -fn_800330F8 = .text:0x800330F8; // type:function size:0x48 -fn_80033140 = .text:0x80033140; // type:function size:0x3C -fn_8003317C = .text:0x8003317C; // type:function size:0x5C -fn_800331D8 = .text:0x800331D8; // type:function size:0x28 -fn_80033200 = .text:0x80033200; // type:function size:0x2C -fn_8003322C = .text:0x8003322C; // type:function size:0x54 -fn_80033280 = .text:0x80033280; // type:function size:0x60 -fn_800332E0 = .text:0x800332E0; // type:function size:0x64 -fn_80033344 = .text:0x80033344; // type:function size:0x38 -fn_8003337C = .text:0x8003337C; // type:function size:0x3C -fn_800333B8 = .text:0x800333B8; // type:function size:0x28 -fn_800333E0 = .text:0x800333E0; // type:function size:0x24 -fn_80033404 = .text:0x80033404; // type:function size:0x28 +HuAudFXPauseAll = .text:0x80032F9C; // type:function size:0x2C +HuAudFXStatusGet = .text:0x80032FC8; // type:function size:0x28 +HuAudFXPitchSet = .text:0x80032FF0; // type:function size:0x54 +HuAudFXVolSet = .text:0x80033044; // type:function size:0x58 +HuAudSeqPlay = .text:0x8003309C; // type:function size:0x5C +HuAudSeqStop = .text:0x800330F8; // type:function size:0x48 +HuAudSeqFadeOut = .text:0x80033140; // type:function size:0x3C +HuAudSeqAllFadeOut = .text:0x8003317C; // type:function size:0x5C +HuAudSeqAllStop = .text:0x800331D8; // type:function size:0x28 +HuAudSeqPauseAll = .text:0x80033200; // type:function size:0x2C +HuAudSeqPause = .text:0x8003322C; // type:function size:0x54 +HuAudSeqMidiCtrlGet = .text:0x80033280; // type:function size:0x60 +HuAudSStreamPlay = .text:0x800332E0; // type:function size:0x64 +HuAudSStreamStop = .text:0x80033344; // type:function size:0x38 +HuAudSStreamFadeOut = .text:0x8003337C; // type:function size:0x3C +HuAudSStreamAllFadeOut = .text:0x800333B8; // type:function size:0x28 +HuAudSStreamAllStop = .text:0x800333E0; // type:function size:0x24 +HuAudSStreamStatGet = .text:0x80033404; // type:function size:0x28 HuAudDllSndGrpSet = .text:0x8003342C; // type:function size:0x104 HuAudSndGrpSetSet = .text:0x80033530; // type:function size:0x1A4 HuAudSndGrpSet = .text:0x800336D4; // type:function size:0x60 HuAudSndCommonGrpSet = .text:0x80033734; // type:function size:0x154 HuAudAUXSet = .text:0x80033888; // type:function size:0x58 HuAudAUXVolSet = .text:0x800338E0; // type:function size:0xC -fn_800338EC = .text:0x800338EC; // type:function size:0x294 -fn_80033B80 = .text:0x80033B80; // type:function size:0x50 -fn_80033BD0 = .text:0x80033BD0; // type:function size:0x58 -fn_80033C28 = .text:0x80033C28; // type:function size:0x50 -fn_80033C78 = .text:0x80033C78; // type:function size:0xAC -fn_80033D24 = .text:0x80033D24; // type:function size:0xD0 -fn_80033DF4 = .text:0x80033DF4; // type:function size:0x90 +HuAudVoiceInit = .text:0x800338EC; // type:function size:0x294 +HuAudPlayerVoicePlay = .text:0x80033B80; // type:function size:0x50 +HuAudPlayerVoicePlayPos = .text:0x80033BD0; // type:function size:0x58 +HuAudPlayerVoicePlayEntry = .text:0x80033C28; // type:function size:0x50 +HuAudCharVoicePlay = .text:0x80033C78; // type:function size:0xAC +HuAudCharVoicePlayPos = .text:0x80033D24; // type:function size:0xD0 +HuAudCharVoicePlayEntry = .text:0x80033DF4; // type:function size:0x90 HuSePlay = .text:0x80033E84; // type:function size:0x68 scope:local InitEnvelope = .text:0x80033EEC; // type:function size:0x1A4 SetEnvelopMtx = .text:0x80034090; // type:function size:0x23C scope:local @@ -726,16 +726,16 @@ ClusterProc = .text:0x800409F0; // type:function size:0x160 ClusterMotionExec = .text:0x80040B50; // type:function size:0x210 SetShapeMain = .text:0x80040D60; // type:function size:0x36C scope:local ShapeProc = .text:0x800410CC; // type:function size:0xA4 -fn_80041170 = .text:0x80041170; // type:function size:0xB4 -fn_80041224 = .text:0x80041224; // type:function size:0x288 +WipeInit = .text:0x80041170; // type:function size:0xB4 +WipeExecAlways = .text:0x80041224; // type:function size:0x288 WipeCreate = .text:0x800414AC; // type:function size:0x12C -fn_800415D8 = .text:0x800415D8; // type:function size:0x28 -fn_80041600 = .text:0x80041600; // type:function size:0x10 -fn_80041610 = .text:0x80041610; // type:function size:0x8 -fn_80041618 = .text:0x80041618; // type:function size:0xFC -fn_80041714 = .text:0x80041714; // type:function size:0x31C -fn_80041A30 = .text:0x80041A30; // type:function size:0x184 -fn_80041BB4 = .text:0x80041BB4; // type:function size:0x4C8 +WipeColorSet = .text:0x800415D8; // type:function size:0x28 +WipeStatGet = .text:0x80041600; // type:function size:0x10 +WipeDummyFade = .text:0x80041610; // type:function size:0x8 scope:local +WipeNormalFade = .text:0x80041618; // type:function size:0xFC scope:local +WipeColorFill = .text:0x80041714; // type:function size:0x31C scope:local +WipeCrossFade = .text:0x80041A30; // type:function size:0x184 scope:local +WipeFrameStill = .text:0x80041BB4; // type:function size:0x4C8 scope:local HuWindowInit = .text:0x8004207C; // type:function size:0x74 HuWinInit = .text:0x800420F0; // type:function size:0x214 HuWinCreate = .text:0x80042304; // type:function size:0x544 @@ -2112,12 +2112,12 @@ __OSMaskInterrupts = .text:0x800B7604; // type:function size:0x88 scope:global __OSUnmaskInterrupts = .text:0x800B768C; // type:function size:0x88 scope:global fn_800B7714 = .text:0x800B7714; // type:function size:0x344 ExternalInterruptHandler = .text:0x800B7A58; // type:function size:0x50 scope:local -fn_800B7AA8 = .text:0x800B7AA8; // type:function size:0x4 -fn_800B7AAC = .text:0x800B7AAC; // type:function size:0x4 -fn_800B7AB0 = .text:0x800B7AB0; // type:function size:0x274 -fn_800B7D24 = .text:0x800B7D24; // type:function size:0x250 -fn_800B7F74 = .text:0x800B7F74; // type:function size:0x20C -fn_800B8180 = .text:0x800B8180; // type:function size:0x94 +OSNotifyLink = .text:0x800B7AA8; // type:function size:0x4 scope:weak +OSNotifyUnlink = .text:0x800B7AAC; // type:function size:0x4 scope:weak +Relocate = .text:0x800B7AB0; // type:function size:0x274 scope:local +OSLink = .text:0x800B7D24; // type:function size:0x250 +Undo = .text:0x800B7F74; // type:function size:0x20C scope:local +OSUnlink = .text:0x800B8180; // type:function size:0x94 __OSModuleInit = .text:0x800B8214; // type:function size:0x18 scope:global fn_800B822C = .text:0x800B822C; // type:function size:0x60 OSGetPhysicalMemSize = .text:0x800B828C; // type:function size:0xC @@ -2367,31 +2367,31 @@ fn_800C5718 = .text:0x800C5718; // type:function size:0x194 fn_800C58AC = .text:0x800C58AC; // type:function size:0x60 fn_800C590C = .text:0x800C590C; // type:function size:0x54 __PADDisableRecalibration = .text:0x800C5960; // type:function size:0x7C scope:global -fn_800C59DC = .text:0x800C59DC; // type:function size:0x44 -fn_800C5A20 = .text:0x800C5A20; // type:function size:0x88 -fn_800C5AA8 = .text:0x800C5AA8; // type:function size:0x18 -fn_800C5AC0 = .text:0x800C5AC0; // type:function size:0x18 -fn_800C5AD8 = .text:0x800C5AD8; // type:function size:0x1C -fn_800C5AF4 = .text:0x800C5AF4; // type:function size:0xD8 -fn_800C5BCC = .text:0x800C5BCC; // type:function size:0x10 -fn_800C5BDC = .text:0x800C5BDC; // type:function size:0xE0 -fn_800C5CBC = .text:0x800C5CBC; // type:function size:0x14 -fn_800C5CD0 = .text:0x800C5CD0; // type:function size:0xD4 -fn_800C5DA4 = .text:0x800C5DA4; // type:function size:0x10 -fn_800C5DB4 = .text:0x800C5DB4; // type:function size:0x1C -fn_800C5DD0 = .text:0x800C5DD0; // type:function size:0x10 -fn_800C5DE0 = .text:0x800C5DE0; // type:function size:0x1C -fn_800C5DFC = .text:0x800C5DFC; // type:function size:0x10 -fn_800C5E0C = .text:0x800C5E0C; // type:function size:0x164 -fn_800C5F70 = .text:0x800C5F70; // type:function size:0x7C -fn_800C5FEC = .text:0x800C5FEC; // type:function size:0x90 -fn_800C607C = .text:0x800C607C; // type:function size:0x58 -fn_800C60D4 = .text:0x800C60D4; // type:function size:0x1E4 -fn_800C62B8 = .text:0x800C62B8; // type:function size:0x44 -fn_800C62FC = .text:0x800C62FC; // type:function size:0x3C -fn_800C6338 = .text:0x800C6338; // type:function size:0xF0 -fn_800C6428 = .text:0x800C6428; // type:function size:0x68 -fn_800C6490 = .text:0x800C6490; // type:function size:0x74 +AIRegisterDMACallback = .text:0x800C59DC; // type:function size:0x44 +AIInitDMA = .text:0x800C5A20; // type:function size:0x88 +AIStartDMA = .text:0x800C5AA8; // type:function size:0x18 +AIStopDMA = .text:0x800C5AC0; // type:function size:0x18 +AIGetDMAStartAddr = .text:0x800C5AD8; // type:function size:0x1C +AISetStreamPlayState = .text:0x800C5AF4; // type:function size:0xD8 +AIGetStreamPlayState = .text:0x800C5BCC; // type:function size:0x10 +AISetDSPSampleRate = .text:0x800C5BDC; // type:function size:0xE0 +AIGetDSPSampleRate = .text:0x800C5CBC; // type:function size:0x14 +__AI_set_stream_sample_rate = .text:0x800C5CD0; // type:function size:0xD4 scope:local +AIGetStreamSampleRate = .text:0x800C5DA4; // type:function size:0x10 +AISetStreamVolLeft = .text:0x800C5DB4; // type:function size:0x1C +AIGetStreamVolLeft = .text:0x800C5DD0; // type:function size:0x10 +AISetStreamVolRight = .text:0x800C5DE0; // type:function size:0x1C +AIGetStreamVolRight = .text:0x800C5DFC; // type:function size:0x10 +AIInit = .text:0x800C5E0C; // type:function size:0x164 +__AISHandler = .text:0x800C5F70; // type:function size:0x7C +__AIDHandler = .text:0x800C5FEC; // type:function size:0x90 +__AICallbackStackSwitch = .text:0x800C607C; // type:function size:0x58 +__AI_SRC_INIT = .text:0x800C60D4; // type:function size:0x1E4 +ARRegisterDMACallback = .text:0x800C62B8; // type:function size:0x44 +ARGetDMAStatus = .text:0x800C62FC; // type:function size:0x3C +ARStartDMA = .text:0x800C6338; // type:function size:0xF0 +ARAlloc = .text:0x800C6428; // type:function size:0x68 +ARFree = .text:0x800C6490; // type:function size:0x74 ARCheckInit = .text:0x800C6504; // type:function size:0x8 ARInit = .text:0x800C650C; // type:function size:0xBC ARSetSize = .text:0x800C65C8; // type:function size:0x4 @@ -3494,93 +3494,93 @@ AMC_IsStub = .text:0x80115454; // type:function size:0x8 scope:global Hu_IsStub = .text:0x8011545C; // type:function size:0x8 scope:weak HuSetVecF = .text:0x80115464; // type:function size:0x10 HuSubVecF = .text:0x80115474; // type:function size:0x34 -fn_801154A8 = .text:0x801154A8; // type:function size:0x6C -fn_80115514 = .text:0x80115514; // type:function size:0x27C -fn_80115790 = .text:0x80115790; // type:function size:0x15C -fn_801158EC = .text:0x801158EC; // type:function size:0xB4 -fn_801159A0 = .text:0x801159A0; // type:function size:0x31C -fn_80115CBC = .text:0x80115CBC; // type:function size:0x48 -fn_80115D04 = .text:0x80115D04; // type:function size:0x48 -fn_80115D4C = .text:0x80115D4C; // type:function size:0x68 -fn_80115DB4 = .text:0x80115DB4; // type:function size:0xD8 -fn_80115E8C = .text:0x80115E8C; // type:function size:0xFC -fn_80115F88 = .text:0x80115F88; // type:function size:0x4 -fn_80115F8C = .text:0x80115F8C; // type:function size:0x14 -fn_80115FA0 = .text:0x80115FA0; // type:function size:0xD8 -fn_80116078 = .text:0x80116078; // type:function size:0x114 -fn_8011618C = .text:0x8011618C; // type:function size:0x28 -fn_801161B4 = .text:0x801161B4; // type:function size:0x140 -fn_801162F4 = .text:0x801162F4; // type:function size:0x28C -fn_80116580 = .text:0x80116580; // type:function size:0x298 -fn_80116818 = .text:0x80116818; // type:function size:0x3F0 -fn_80116C08 = .text:0x80116C08; // type:function size:0x3B4 -fn_80116FBC = .text:0x80116FBC; // type:function size:0x278 -fn_80117234 = .text:0x80117234; // type:function size:0x20 -fn_80117254 = .text:0x80117254; // type:function size:0x474 -fn_801176C8 = .text:0x801176C8; // type:function size:0xC8 -fn_80117790 = .text:0x80117790; // type:function size:0x104 -fn_80117894 = .text:0x80117894; // type:function size:0x64 -fn_801178F8 = .text:0x801178F8; // type:function size:0x30 -fn_80117928 = .text:0x80117928; // type:function size:0x34 -fn_8011795C = .text:0x8011795C; // type:function size:0x2C -fn_80117988 = .text:0x80117988; // type:function size:0x60 -fn_801179E8 = .text:0x801179E8; // type:function size:0x154 -fn_80117B3C = .text:0x80117B3C; // type:function size:0x174 -fn_80117CB0 = .text:0x80117CB0; // type:function size:0x1BC -fn_80117E6C = .text:0x80117E6C; // type:function size:0x4 -fn_80117E70 = .text:0x80117E70; // type:function size:0x1CC -fn_8011803C = .text:0x8011803C; // type:function size:0x9C -fn_801180D8 = .text:0x801180D8; // type:function size:0x38 -fn_80118110 = .text:0x80118110; // type:function size:0x3C -fn_8011814C = .text:0x8011814C; // type:function size:0x30 -fn_8011817C = .text:0x8011817C; // type:function size:0x16C -fn_801182E8 = .text:0x801182E8; // type:function size:0x88 -fn_80118370 = .text:0x80118370; // type:function size:0x74 -fn_801183E4 = .text:0x801183E4; // type:function size:0x134 -fn_80118518 = .text:0x80118518; // type:function size:0xCC -fn_801185E4 = .text:0x801185E4; // type:function size:0x328 -fn_8011890C = .text:0x8011890C; // type:function size:0x174 -fn_80118A80 = .text:0x80118A80; // type:function size:0x250 -fn_80118CD0 = .text:0x80118CD0; // type:function size:0x184 -fn_80118E54 = .text:0x80118E54; // type:function size:0x270 -fn_801190C4 = .text:0x801190C4; // type:function size:0x30 -fn_801190F4 = .text:0x801190F4; // type:function size:0x4C -fn_80119140 = .text:0x80119140; // type:function size:0xD8 -fn_80119218 = .text:0x80119218; // type:function size:0x13C -fn_80119354 = .text:0x80119354; // type:function size:0x74 -fn_801193C8 = .text:0x801193C8; // type:function size:0x38 -fn_80119400 = .text:0x80119400; // type:function size:0x60 -fn_80119460 = .text:0x80119460; // type:function size:0x30 -fn_80119490 = .text:0x80119490; // type:function size:0x320 -fn_801197B0 = .text:0x801197B0; // type:function size:0x80 -fn_80119830 = .text:0x80119830; // type:function size:0x168 -fn_80119998 = .text:0x80119998; // type:function size:0xFC -fn_80119A94 = .text:0x80119A94; // type:function size:0x480 -fn_80119F14 = .text:0x80119F14; // type:function size:0x130 -fn_8011A044 = .text:0x8011A044; // type:function size:0xC8 -fn_8011A10C = .text:0x8011A10C; // type:function size:0x118 -fn_8011A224 = .text:0x8011A224; // type:function size:0xE0 -fn_8011A304 = .text:0x8011A304; // type:function size:0x204 -fn_8011A508 = .text:0x8011A508; // type:function size:0x88 -fn_8011A590 = .text:0x8011A590; // type:function size:0x8C -fn_8011A61C = .text:0x8011A61C; // type:function size:0x114 -fn_8011A730 = .text:0x8011A730; // type:function size:0x68 -fn_8011A798 = .text:0x8011A798; // type:function size:0x10C -fn_8011A8A4 = .text:0x8011A8A4; // type:function size:0x2A8 -fn_8011AB4C = .text:0x8011AB4C; // type:function size:0x2B8 -fn_8011AE04 = .text:0x8011AE04; // type:function size:0x1AC -fn_8011AFB0 = .text:0x8011AFB0; // type:function size:0x2E8 -fn_8011B298 = .text:0x8011B298; // type:function size:0x33C -fn_8011B5D4 = .text:0x8011B5D4; // type:function size:0x13C -fn_8011B710 = .text:0x8011B710; // type:function size:0xE0 -fn_8011B7F0 = .text:0x8011B7F0; // type:function size:0x448 -fn_8011BC38 = .text:0x8011BC38; // type:function size:0x2DC -fn_8011BF14 = .text:0x8011BF14; // type:function size:0xD0 -fn_8011BFE4 = .text:0x8011BFE4; // type:function size:0x320 -fn_8011C304 = .text:0x8011C304; // type:function size:0x4A8 -fn_8011C7AC = .text:0x8011C7AC; // type:function size:0x188 -fn_8011C934 = .text:0x8011C934; // type:function size:0x17C -fn_8011CAB0 = .text:0x8011CAB0; // type:function size:0x214 +msmSysServer = .text:0x801154A8; // type:function size:0x6C scope:local +msmSysSetAuxParam = .text:0x80115514; // type:function size:0x27C scope:local +msmSysLoadBaseGroup = .text:0x80115790; // type:function size:0x15C scope:local +msmSysSearchGroupStack = .text:0x801158EC; // type:function size:0xB4 scope:local +msmSysGroupInit = .text:0x801159A0; // type:function size:0x31C scope:local +msmSysIrqDisable = .text:0x80115CBC; // type:function size:0x48 +msmSysIrqEnable = .text:0x80115D04; // type:function size:0x48 +msmSysCheckBaseGroup = .text:0x80115D4C; // type:function size:0x68 +msmSysGetGroupDataPtr = .text:0x80115DB4; // type:function size:0xD8 +msmSysCheckLoadGroupID = .text:0x80115E8C; // type:function size:0xFC +msmSysRegularProc = .text:0x80115F88; // type:function size:0x4 +msmSysGetOutputMode = .text:0x80115F8C; // type:function size:0x14 +msmSysSetOutputMode = .text:0x80115FA0; // type:function size:0xD8 +msmSysSetAux = .text:0x80116078; // type:function size:0x114 +msmSysGetSampSize = .text:0x8011618C; // type:function size:0x28 +msmSysDelGroupAll = .text:0x801161B4; // type:function size:0x140 +msmSysDelGroupBase = .text:0x801162F4; // type:function size:0x28C +msmSysLoadGroupBase = .text:0x80116580; // type:function size:0x298 +msmSysLoadGroupSet = .text:0x80116818; // type:function size:0x3F0 +msmSysLoadGroupSub = .text:0x80116C08; // type:function size:0x3B4 +msmSysLoadGroup = .text:0x80116FBC; // type:function size:0x278 +msmSysCheckInit = .text:0x80117234; // type:function size:0x20 +msmSysInit = .text:0x80117254; // type:function size:0x474 +msmMemFree = .text:0x801176C8; // type:function size:0xC8 +msmMemAlloc = .text:0x80117790; // type:function size:0x104 +msmMemInit = .text:0x80117894; // type:function size:0x64 +msmFioClose = .text:0x801178F8; // type:function size:0x30 +msmFioRead = .text:0x80117928; // type:function size:0x34 +msmFioOpen = .text:0x8011795C; // type:function size:0x2C +msmFioInit = .text:0x80117988; // type:function size:0x60 +msmMusPauseSub = .text:0x801179E8; // type:function size:0x154 scope:local +msmMusPauseFade = .text:0x80117B3C; // type:function size:0x174 scope:local +msmMusFade = .text:0x80117CB0; // type:function size:0x1BC scope:local +msmMusFdoutEnd = .text:0x80117E6C; // type:function size:0x4 +msmMusPeriodicProc = .text:0x80117E70; // type:function size:0x1CC +msmMusGetMidiCtrl = .text:0x8011803C; // type:function size:0x9C +msmMusGetNumPlay = .text:0x801180D8; // type:function size:0x38 +msmMusGetStatus = .text:0x80118110; // type:function size:0x3C +msmMusSetMasterVolume = .text:0x8011814C; // type:function size:0x30 +msmMusSetParam = .text:0x8011817C; // type:function size:0x16C +msmMusPauseAll = .text:0x801182E8; // type:function size:0x88 +msmMusPause = .text:0x80118370; // type:function size:0x74 +msmMusStopAll = .text:0x801183E4; // type:function size:0x134 +msmMusStop = .text:0x80118518; // type:function size:0xCC +msmMusPlay = .text:0x801185E4; // type:function size:0x328 +msmMusInit = .text:0x8011890C; // type:function size:0x174 +msmSeFade = .text:0x80118A80; // type:function size:0x250 scope:local +msmSePauseSub = .text:0x80118CD0; // type:function size:0x184 scope:local +msmSePeriodicProc = .text:0x80118E54; // type:function size:0x270 +msmSeGetIndexPtr = .text:0x801190C4; // type:function size:0x30 +msmSeDelListener = .text:0x801190F4; // type:function size:0x4C +msmSeUpdataListener = .text:0x80119140; // type:function size:0xD8 +msmSeSetListener = .text:0x80119218; // type:function size:0x13C +msmSeGetEntryID = .text:0x80119354; // type:function size:0x74 +msmSeGetNumPlay = .text:0x801193C8; // type:function size:0x38 +msmSeGetStatus = .text:0x80119400; // type:function size:0x60 +msmSeSetMasterVolume = .text:0x80119460; // type:function size:0x30 +msmSeSetParam = .text:0x80119490; // type:function size:0x320 +msmSePauseAll = .text:0x801197B0; // type:function size:0x80 +msmSeStopAll = .text:0x80119830; // type:function size:0x168 +msmSeStop = .text:0x80119998; // type:function size:0xFC +msmSePlay = .text:0x80119A94; // type:function size:0x480 +msmSeInit = .text:0x80119F14; // type:function size:0x130 +msmStreamGetStatus = .text:0x8011A044; // type:function size:0xC8 +msmStreamSetMasterVolume = .text:0x8011A10C; // type:function size:0x118 +msmStreamPauseAll = .text:0x8011A224; // type:function size:0xE0 +msmStreamStop = .text:0x8011A304; // type:function size:0x204 +msmStreamPlay = .text:0x8011A508; // type:function size:0x88 +msmStreamPeriodicProc = .text:0x8011A590; // type:function size:0x8C +msmStreamSetOutputMode = .text:0x8011A61C; // type:function size:0x114 +msmStreamAmemFree = .text:0x8011A730; // type:function size:0x68 +msmStreamAmemAlloc = .text:0x8011A798; // type:function size:0x10C +msmStreamInit = .text:0x8011A8A4; // type:function size:0x2A8 +msmStreamPauseOff = .text:0x8011AB4C; // type:function size:0x2B8 +msmStreamPauseOn = .text:0x8011AE04; // type:function size:0x1AC +msmStreamPauseFade = .text:0x8011AFB0; // type:function size:0x2E8 +msmStreamFade = .text:0x8011B298; // type:function size:0x33C +msmStreamStopSub = .text:0x8011B5D4; // type:function size:0x13C scope:local +msmStreamSetParamSub = .text:0x8011B710; // type:function size:0xE0 scope:local +msmStreamPackStartStereo = .text:0x8011B7F0; // type:function size:0x448 +msmStreamPackStartMono = .text:0x8011BC38; // type:function size:0x2DC +msmStreamSlotOff = .text:0x8011BF14; // type:function size:0xD0 +msmStreamData = .text:0x8011BFE4; // type:function size:0x320 scope:local +msmStreamDvdCallback = .text:0x8011C304; // type:function size:0x4A8 scope:local +msmStreamDvdCallback2 = .text:0x8011C7AC; // type:function size:0x188 scope:local +msmStreamUpdateFunc = .text:0x8011C934; // type:function size:0x17C scope:local +msmStreamSlotInit = .text:0x8011CAB0; // type:function size:0x214 scope:local fn_8011CCC4 = .text:0x8011CCC4; // type:function size:0x4 fn_8011CCC8 = .text:0x8011CCC8; // type:function size:0x4 fn_8011CCCC = .text:0x8011CCCC; // type:function size:0x4 @@ -4918,7 +4918,9 @@ lbl_8012E4F0 = .data:0x8012E4F0; // type:object size:0x21A lbl_8012E70A = .data:0x8012E70A; // type:object size:0xB data:string lbl_8012E715 = .data:0x8012E715; // type:object size:0x273 lbl_8012E988 = .data:0x8012E988; // type:object size:0x12 data:string -lbl_8012E99A = .data:0x8012E99A; // type:object size:0x71A +lbl_8012E99A = .data:0x8012E99A; // type:object size:0xD6 +sndGrpTable = .data:0x8012EA70; // type:object size:0x5B0 +lbl_8012F020 = .data:0x8012F020; // type:object size:0x94 lbl_8012F0B4 = .data:0x8012F0B4; // type:object size:0x11 data:string lbl_8012F0C5 = .data:0x8012F0C5; // type:object size:0x3A lbl_8012F0FF = .data:0x8012F0FF; // type:object size:0x31 @@ -5419,14 +5421,14 @@ GWPlayer = .bss:0x8018FC38; // type:object size:0xC0 data:byte GWSystem = .bss:0x8018FCF8; // type:object size:0xE0 data:byte GWGameStat = .bss:0x8018FDD8; // type:object size:0x118 GWGameStatDefault = .bss:0x8018FEF0; // type:object size:0x118 -lbl_80190008 = .bss:0x80190008; // type:object size:0xC data:float -lbl_80190014 = .bss:0x80190014; // type:object size:0xC data:float -lbl_80190020 = .bss:0x80190020; // type:object size:0xC0 -lbl_801900E0 = .bss:0x801900E0; // type:object size:0xC0 -lbl_801901A0 = .bss:0x801901A0; // type:object size:0x40 -lbl_801901E0 = .bss:0x801901E0; // type:object size:0x50 -lbl_80190230 = .bss:0x80190230; // type:object size:0x200 -lbl_80190430 = .bss:0x80190430; // type:object size:0x20 +CRot = .bss:0x80190008; // type:object size:0xC data:float +Center = .bss:0x80190014; // type:object size:0xC data:float +CRotM = .bss:0x80190020; // type:object size:0xC0 +CenterM = .bss:0x801900E0; // type:object size:0xC0 +CZoomM = .bss:0x801901A0; // type:object size:0x40 +omDLLinfoTbl = .bss:0x801901E0; // type:object size:0x50 +sndFXBuf = .bss:0x80190230; // type:object size:0x200 scope:local +charVoiceGroupStat = .bss:0x80190430; // type:object size:0x20 scope:local lbl_80190450 = .bss:0x80190450; // type:object size:0x400 data:4byte lbl_80190850 = .bss:0x80190850; // type:object size:0x10 data:2byte lbl_80190860 = .bss:0x80190860; // type:object size:0x600 data:2byte @@ -6096,34 +6098,34 @@ y_start = .sbss:0x801D3CF0; // type:object size:0x4 scope:local data:4byte x_start = .sbss:0x801D3CF4; // type:object size:0x4 scope:local data:4byte Draw_Color = .sbss:0x801D3CF8; // type:object size:0x3 scope:local data:byte XFB_putc = .sbss:0x801D3CFC; // type:object size:0x4 scope:local data:4byte -lbl_801D3D00 = .sbss:0x801D3D00; // type:object size:0x4 -lbl_801D3D04 = .sbss:0x801D3D04; // type:object size:0x4 data:float -lbl_801D3D08 = .sbss:0x801D3D08; // type:object size:0x8 data:4byte +omDBGMenuButton = .sbss:0x801D3D00; // type:object size:0x4 +CZoom = .sbss:0x801D3D04; // type:object size:0x4 data:float +omDLLFileList = .sbss:0x801D3D08; // type:object size:0x8 scope:local data:4byte frand_seed = .sbss:0x801D3D10; // type:object size:0x8 scope:local data:4byte fadeStat = .sbss:0x801D3D18; // type:object size:0x1 data:byte -lbl_801D3D1C = .sbss:0x801D3D1C; // type:object size:0x4 data:4byte -lbl_801D3D20 = .sbss:0x801D3D20; // type:object size:0x4 data:float -lbl_801D3D24 = .sbss:0x801D3D24; // type:object size:0x4 data:float -lbl_801D3D28 = .sbss:0x801D3D28; // type:object size:0x4 data:float -lbl_801D3D2C = .sbss:0x801D3D2C; // type:object size:0x4 data:float -lbl_801D3D30 = .sbss:0x801D3D30; // type:object size:0x4 data:float -lbl_801D3D34 = .sbss:0x801D3D34; // type:object size:0x1 data:byte -lbl_801D3D35 = .sbss:0x801D3D35; // type:object size:0x1 data:byte -lbl_801D3D38 = .sbss:0x801D3D38; // type:object size:0x4 data:4byte -lbl_801D3D3C = .sbss:0x801D3D3C; // type:object size:0x4 data:4byte -lbl_801D3D40 = .sbss:0x801D3D40; // type:object size:0x2 data:2byte -lbl_801D3D42 = .sbss:0x801D3D42; // type:object size:0x6 data:2byte -lbl_801D3D48 = .sbss:0x801D3D48; // type:object size:0x4 data:4byte -lbl_801D3D4C = .sbss:0x801D3D4C; // type:object size:0x4 data:4byte -lbl_801D3D50 = .sbss:0x801D3D50; // type:object size:0x4 data:4byte -lbl_801D3D54 = .sbss:0x801D3D54; // type:object size:0x4 data:4byte -lbl_801D3D58 = .sbss:0x801D3D58; // type:object size:0x4 data:4byte -lbl_801D3D5C = .sbss:0x801D3D5C; // type:object size:0x4 data:4byte -lbl_801D3D60 = .sbss:0x801D3D60; // type:object size:0x4 data:4byte -lbl_801D3D64 = .sbss:0x801D3D64; // type:object size:0x4 data:4byte -lbl_801D3D68 = .sbss:0x801D3D68; // type:object size:0x4 data:4byte -lbl_801D3D6C = .sbss:0x801D3D6C; // type:object size:0x4 data:4byte -lbl_801D3D70 = .sbss:0x801D3D70; // type:object size:0x8 data:4byte +musicOffF = .sbss:0x801D3D1C; // type:object size:0x4 data:4byte +Snd3DDistOffset = .sbss:0x801D3D20; // type:object size:0x4 data:float +Snd3DSpeedOffset = .sbss:0x801D3D24; // type:object size:0x4 data:float +Snd3DStartDisOffset = .sbss:0x801D3D28; // type:object size:0x4 data:float +Snd3DFrontSurDisOffset = .sbss:0x801D3D2C; // type:object size:0x4 data:float +Snd3DBackSurDisOffset = .sbss:0x801D3D30; // type:object size:0x4 data:float +HuAuxBVol = .sbss:0x801D3D34; // type:object size:0x1 data:byte +HuAuxAVol = .sbss:0x801D3D35; // type:object size:0x1 data:byte +auxBNoBak = .sbss:0x801D3D38; // type:object size:0x4 scope:local data:4byte +auxANoBak = .sbss:0x801D3D3C; // type:object size:0x4 scope:local data:4byte +sndGroupBak = .sbss:0x801D3D40; // type:object size:0x2 scope:local data:2byte +Hu3DAudVol = .sbss:0x801D3D42; // type:object size:0x6 scope:local data:2byte +Meshno = .sbss:0x801D3D48; // type:object size:0x4 scope:local data:4byte +Meshcnt = .sbss:0x801D3D4C; // type:object size:0x4 scope:local data:4byte +normtop = .sbss:0x801D3D50; // type:object size:0x4 scope:local data:4byte +normenv = .sbss:0x801D3D54; // type:object size:0x4 scope:local data:4byte +vtxenv = .sbss:0x801D3D58; // type:object size:0x4 scope:local data:4byte +CurHsf = .sbss:0x801D3D5C; // type:object size:0x4 scope:local data:4byte +objtop = .sbss:0x801D3D60; // type:object size:0x4 scope:local data:4byte +nMesh = .sbss:0x801D3D64; // type:object size:0x4 scope:local data:4byte +nObj = .sbss:0x801D3D68; // type:object size:0x4 scope:local data:4byte +MtxTop = .sbss:0x801D3D6C; // type:object size:0x4 data:4byte +Vertextop = .sbss:0x801D3D70; // type:object size:0x8 data:4byte lbl_801D3D78 = .sbss:0x801D3D78; // type:object size:0x4 data:4byte lbl_801D3D7C = .sbss:0x801D3D7C; // type:object size:0x4 data:4byte lbl_801D3D80 = .sbss:0x801D3D80; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index 2514bbe8..1788a3b1 100755 --- a/configure.py +++ b/configure.py @@ -254,7 +254,11 @@ config.libs = [ Object(Matching, "game/objmain.c"), Object(NonMatching, "game/fault.c"), Object(NonMatching, "game/gamework.c"), + Object(NonMatching, "game/objsysobj.c"), + Object(NonMatching, "game/objdll.c"), Object(Matching, "game/frand.c"), + Object(NonMatching, "game/audio.c"), + Object(NonMatching, "game/EnvelopeExec.c"), Object(Matching, "game/ovllist.c"), Object(NonMatching, "game/window.c"), Object(Matching, "game/messdata.c"), diff --git a/include/functions.h b/include/functions.h index a788fb34..c18040d7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -16,7 +16,7 @@ void Hu3DCameraViewportSet(s16, f32, f32, f32, f32, f32, f32); void fn_80044920(s16); void fn_80045F74(s16, s32); s32 fn_800578E4(void); -void fn_80032A58(int arg0); +void HuAudFadeOut(int arg0); void fn_80035A0C(void); void HuDecodeData(void *src, void *dst, u32 size, int decode_type); @@ -102,6 +102,7 @@ void omSysPauseEnable(BOOL flag); void WipeCreate(char dir, char type, short duration); +u8 WipeStatGet(void); void pfInit(void); void pfClsScr(void); @@ -174,7 +175,7 @@ s16 HuPadStatGet(s16); void HuAudFXListnerKill(void); void HuAudDllSndGrpSet(u16 ovl); -void fn_800338EC(s16 ovl); +void HuAudVoiceInit(s16 ovl); void fn_80035A0C(void); @@ -199,7 +200,6 @@ void fn_80083F84(void); void fn_800884F4(s32); void fn_800A4C88(void); void fn_800A6B10(void); -u8 fn_80041600(void); void fn_8008853C(s32); void fn_800B42B4(s32); void fn_80082AAC(s32); diff --git a/src/REL/subchrselDll/subchrselDll.c b/src/REL/subchrselDll/subchrselDll.c index a63820c0..ad4b7128 100644 --- a/src/REL/subchrselDll/subchrselDll.c +++ b/src/REL/subchrselDll/subchrselDll.c @@ -93,7 +93,7 @@ static void SubchrMain() GWPlayerCfg[i].character = ext_character[i]+7; } } - fn_80032A58(30); + HuAudFadeOut(30); WipeCreate(2, 0, -1); HuPrcSleep(wipeData.duration+1.0f); fn_80035A0C(); @@ -145,7 +145,7 @@ static void SubchrMain() cursor_pos = 0; } if(GetBtns() & 0x200) { - fn_80032A58(30); + HuAudFadeOut(30); WipeCreate(2, 0, -1); HuPrcSleep(wipeData.duration+1.0f); fn_80035A0C(); diff --git a/src/REL/w10Dll/w10Dll4.c b/src/REL/w10Dll/w10Dll4.c index 81894b5f..b435f8bc 100644 --- a/src/REL/w10Dll/w10Dll4.c +++ b/src/REL/w10Dll/w10Dll4.c @@ -129,7 +129,7 @@ void fn_1_1984(void) { s32 i; if (lbl_1_bss_C == 0) { - if (fn_80041600() != 0) { + if (WipeStatGet() != 0) { HuWinDispOff(lbl_1_bss_E); return; } @@ -160,7 +160,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) { s32 i; if (arg0 == 0x1E) { if (lbl_1_bss_C == 0) { - if (fn_80041600() != 0) { + if (WipeStatGet() != 0) { HuWinDispOff(lbl_1_bss_E); } else { HuWinDispOn(lbl_1_bss_E); diff --git a/src/game/objmain.c b/src/game/objmain.c index 418f45cb..5c5feb25 100644 --- a/src/game/objmain.c +++ b/src/game/objmain.c @@ -71,7 +71,7 @@ static void omWatchOverlayProc(void) OSReport("objman>Init esp\n"); espInit(); OSReport("objman>Call objectsetup\n"); - fn_800338EC(omnextovl); + HuAudVoiceInit(omnextovl); HuAudDllSndGrpSet(omnextovl); omcurovl = omnextovl; omovlevtno = omnextovlevtno;