diff --git a/GM8E01-0-00/map b/GM8E01-0-00/map index 8ce8490..795a24e 100644 --- a/GM8E01-0-00/map +++ b/GM8E01-0-00/map @@ -1094,6 +1094,7 @@ 80048174 00000004 80048174 0 LoadScriptObjects__13CStateManagerF7TAreaIdR12CInputStreamQ213CStateManager18EScriptPersistence 800482E8 00000004 800482E8 0 GenerateObject__13CStateManagerF9TEditorId 8004840C 00000004 8004840C 0 LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream +800486F4 00000004 800486F4 0 sub_800486f4 800486F8 00000004 800486F8 0 __dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv 80048784 00000004 80048784 0 InformListeners__13CStateManagerFRC9CVector3f16EListenNoiseType 80048870 00000004 80048870 0 Listen__3CAiFRC9CVector3f16EListenNoiseType @@ -1327,7 +1328,7 @@ 800556F0 00000004 800556F0 0 __dt__6CActorFv 80055820 00000004 80055820 0 __ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId 80055D28 00000004 80055D28 0 MakeActorMaterialList__FRC13CMaterialListRC16CActorParameters -80055D60 00000004 80055D60 0 sub_80055d60 +80055D60 00000004 80055D60 0 CyclePauseState__6CWorldFv 80055DA8 00000004 80055DA8 0 StopSounds__6CWorldFv 80055E64 00000004 80055E64 0 StopSound__6CWorldFs 80055F38 00000004 80055F38 0 sub_80055f38 @@ -8523,19 +8524,19 @@ 801A9DA8 00000004 801A9DA8 0 __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf 801AA1BC 00000004 801AA1BC 0 __sinit_CCollisionActor_cpp 801AA284 00000004 801AA284 0 __dt__18CScriptPlayerActorFv -801AA3FC 00000004 801AA3FC 0 sub_801aa3fc -801AA53C 00000004 801AA53C 0 sub_801aa53c +801AA3FC 00000004 801AA3FC 0 SetIntoStateManager__18CScriptPlayerActorFR13CStateManagerb +801AA53C 00000004 801AA53C 0 SetupEnvFx__18CScriptPlayerActorFRC13CStateManagerb 801AA5E8 00000004 801AA5E8 0 SetActive__18CScriptPlayerActorFb 801AA624 00000004 801AA624 0 PreRender__18CScriptPlayerActorFR13CStateManagerRC14CFrustumPlanes -801AA778 00000004 801AA778 0 sub_801aa778 -801AA7FC 00000004 801AA7FC 0 sub_801aa7fc -801AA8A8 00000004 801AA8A8 0 sub_801aa8a8 -801AA948 00000004 801AA948 0 sub_801aa948 -801AAAF4 00000004 801AAAF4 0 sub_801aaaf4 -801AABEC 00000004 801AABEC 0 sub_801aabec -801AADE4 00000004 801AADE4 0 sub_801aade4 -801AAF48 00000004 801AAF48 0 sub_801aaf48 -801AB0D0 00000004 801AB0D0 0 sub_801ab0d0 +801AA778 00000004 801AA778 0 GetSuitCharIdx__18CScriptPlayerActorCFRC13CStateManager11EPlayerSuit +801AA7FC 00000004 801AA7FC 0 GetNextSuitCharIdx__18CScriptPlayerActorFRC13CStateManager +801AA8A8 00000004 801AA8A8 0 PumpBeamModel__18CScriptPlayerActorFRC13CStateManager +801AA948 00000004 801AA948 0 PumpSuitModel__18CScriptPlayerActorFRC13CStateManager +801AAAF4 00000004 801AAAF4 0 LoadBeam__18CScriptPlayerActorF7EBeamId +801AABEC 00000004 801AABEC 0 LoadSuit__18CScriptPlayerActorFUi +801AADE4 00000004 801AADE4 0 SetupOfflineModelData__18CScriptPlayerActorFv +801AAF48 00000004 801AAF48 0 SetupOnlineModelData__18CScriptPlayerActorFv +801AB0D0 00000004 801AB0D0 0 BuildBeamModelData__18CScriptPlayerActorFv 801AB164 00000004 801AB164 0 AddToRenderer__18CScriptPlayerActorCFRC14CFrustumPlanesRC13CStateManager 801AB1C8 00000004 801AB1C8 0 TouchModels_Internal__18CScriptPlayerActorFRC13CStateManager 801AB2C8 00000004 801AB2C8 0 TouchModels__18CScriptPlayerActorFRC13CStateManager @@ -9323,9 +9324,9 @@ 801E4D44 00000004 801E4D44 0 GetParticleEmission__17CParticleElectricFv 801E4D50 00000004 801E4D50 0 GetNextBestPt__FiPC9CVector3fiR9CRandom16 801E4E20 00000004 801E4E20 0 PointGenerator__20CActorModelParticlesFUiPC9CVector3fPC9CVector3fi -801E4E40 00000004 801E4E40 0 sub_801e4e40 +801E4E40 00000004 801E4E40 0 RemoveRainSplashGenerator__20CActorModelParticlesFR18CScriptPlayerActor 801E4EA0 00000004 801E4EA0 0 __as__Q24rstl32auto_ptr<20CRainSplashGenerator>FRCQ24rstl32auto_ptr<20CRainSplashGenerator> -801E4F10 00000004 801E4F10 0 sub_801e4f10 +801E4F10 00000004 801E4F10 0 AddRainSplashGenerator__20CActorModelParticlesFR18CScriptPlayerActorR13CStateManageriif 801E5044 00000004 801E5044 0 sub_801e5044 801E50F0 00000004 801E50F0 0 sub_801e50f0 801E5150 00000004 801E5150 0 sub_801e5150 @@ -13905,10 +13906,10 @@ 803192D4 00000004 803192D4 0 RenderParticlesIndirectTexture__11CElementGenFv 80319E3C 00000004 80319E3C 0 sub_80319e3c 8031A51C 00000004 8031A51C 0 RenderParticles__11CElementGenFv -8031BEFC 00000004 8031BEFC 0 sub_8031befc -8031C110 00000004 8031C110 0 sub_8031c110 -8031C288 00000004 8031C288 0 sub_8031c288 -8031C438 00000004 8031C438 0 sub_8031c438 +8031BEFC 00000004 8031BEFC 0 RenderBasicParticlesRotNoTS__11CElementGenFRC10CTransform +8031C110 00000004 8031C110 0 RenderBasicParticlesNoRotNoTS__11CElementGenFRC10CTransform +8031C288 00000004 8031C288 0 RenderBasicParticlesRotTS__11CElementGenFRC10CTransform +8031C438 00000004 8031C438 0 RenderBasicParticlesNoRotTS__11CElementGenFRC10CTransform 8031C54C 00000004 8031C54C 0 Render__11CElementGenFv 8031C680 00000004 8031C680 0 IsSystemDeletable__11CElementGenCFv 8031C720 00000004 8031C720 0 DestroyParticles__11CElementGenFv diff --git a/GM8E01-0-00/objects b/GM8E01-0-00/objects index 7c303a2..5cfae58 100644 --- a/GM8E01-0-00/objects +++ b/GM8E01-0-00/objects @@ -4994,7 +4994,9 @@ 8004840C LVAR B4 LR 8004840C LVAR B0 BPpop 8004840C LVAR -B0 BPpush +8004843C STR 6 aHhi8 80048508 COMM 0 0x00000001 +800486F4 FUNC 4 sub_800486f4 800486F8 FUNC 4 __dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv 800486F8 LVAR 24 LR 800486F8 LVAR 20 BPpop @@ -6055,7 +6057,7 @@ 80055C78 COMM 0 size 80055C90 COMM 0 0x5343414E 'SCAN' 80055D28 FUNC 4 MakeActorMaterialList__FRC13CMaterialListRC16CActorParameters -80055D60 FUNC 4 sub_80055d60 +80055D60 FUNC 4 CyclePauseState__6CWorldFv 80055D60 LVAR 14 LR 80055D60 LVAR 10 BPpop 80055D60 LVAR -10 BPpush @@ -29409,12 +29411,13 @@ 801AA284 LVAR 24 LR 801AA284 LVAR 20 BPpop 801AA284 LVAR -20 BPpush -801AA3FC FUNC 4 sub_801aa3fc +801AA3FC FUNC 4 SetIntoStateManager__18CScriptPlayerActorFR13CStateManagerb 801AA3FC LVAR 64 LR 801AA3FC LVAR 60 BPpop +801AA3FC LVAR 2C paId 801AA3FC LVAR -60 BPpush 801AA488 COMM 0 0x00000356 -801AA53C FUNC 4 sub_801aa53c +801AA53C FUNC 4 SetupEnvFx__18CScriptPlayerActorFRC13CStateManagerb 801AA53C LVAR 14 LR 801AA53C LVAR 10 BPpop 801AA53C LVAR -10 BPpush @@ -29426,23 +29429,23 @@ 801AA624 LVAR 34 LR 801AA624 LVAR 30 BPpop 801AA624 LVAR -30 BPpush -801AA778 FUNC 4 sub_801aa778 +801AA778 FUNC 4 GetSuitCharIdx__18CScriptPlayerActorCFRC13CStateManager11EPlayerSuit 801AA778 LVAR 14 LR 801AA778 LVAR 10 BPpop 801AA778 LVAR -10 BPpush -801AA7FC FUNC 4 sub_801aa7fc +801AA7FC FUNC 4 GetNextSuitCharIdx__18CScriptPlayerActorFRC13CStateManager 801AA7FC LVAR 14 LR 801AA7FC LVAR 10 BPpop 801AA7FC LVAR -10 BPpush -801AA8A8 FUNC 4 sub_801aa8a8 +801AA8A8 FUNC 4 PumpBeamModel__18CScriptPlayerActorFRC13CStateManager 801AA8A8 LVAR 14 LR 801AA8A8 LVAR 10 BPpop 801AA8A8 LVAR -10 BPpush -801AA948 FUNC 4 sub_801aa948 +801AA948 FUNC 4 PumpSuitModel__18CScriptPlayerActorFRC13CStateManager 801AA948 LVAR 24 LR 801AA948 LVAR 20 BPpop 801AA948 LVAR -20 BPpush -801AAAF4 FUNC 4 sub_801aaaf4 +801AAAF4 FUNC 4 LoadBeam__18CScriptPlayerActorF7EBeamId 801AAAF4 LVAR 34 LR 801AAAF4 LVAR 30 BPpop 801AAAF4 LVAR -30 BPpush @@ -29451,7 +29454,7 @@ 801AAB34 COMM 0 unsigned __int32 801AAB38 COMM 0 char * 801AAB50 COMM 0 0x434D444C 'CMDL' -801AABEC FUNC 4 sub_801aabec +801AABEC FUNC 4 LoadSuit__18CScriptPlayerActorFUi 801AABEC LVAR 64 LR 801AABEC LVAR 60 BPpop 801AABEC LVAR -60 BPpush @@ -29463,18 +29466,18 @@ 801AAD1C COMM 0 char * 801AAD20 COMM 0 char * 801AAD38 COMM 0 0x43534B52 'CSKR' -801AADE4 FUNC 4 sub_801aade4 +801AADE4 FUNC 4 SetupOfflineModelData__18CScriptPlayerActorFv 801AADE4 LVAR 44 LR 801AADE4 LVAR 40 BPpop 801AADE4 LVAR -40 BPpush 801AADEC COMM 0 char * 801AAE08 COMM 0 char * 801AAE10 COMM 0 unsigned __int32 -801AAF48 FUNC 4 sub_801aaf48 +801AAF48 FUNC 4 SetupOnlineModelData__18CScriptPlayerActorFv 801AAF48 LVAR F4 LR 801AAF48 LVAR F0 BPpop 801AAF48 LVAR -F0 BPpush -801AB0D0 FUNC 4 sub_801ab0d0 +801AB0D0 FUNC 4 BuildBeamModelData__18CScriptPlayerActorFv 801AB0D0 LVAR 24 LR 801AB0D0 LVAR 20 BPpop 801AB0D0 LVAR -20 BPpush @@ -33210,7 +33213,7 @@ 801E4E20 LVAR 14 LR 801E4E20 LVAR 10 BPpop 801E4E20 LVAR -10 BPpush -801E4E40 FUNC 4 sub_801e4e40 +801E4E40 FUNC 4 RemoveRainSplashGenerator__20CActorModelParticlesFR18CScriptPlayerActor 801E4E40 LVAR 24 LR 801E4E40 LVAR 20 BPpop 801E4E40 LVAR -20 BPpush @@ -33218,7 +33221,7 @@ 801E4EA0 LVAR 14 LR 801E4EA0 LVAR 10 BPpop 801E4EA0 LVAR -10 BPpush -801E4F10 FUNC 4 sub_801e4f10 +801E4F10 FUNC 4 AddRainSplashGenerator__20CActorModelParticlesFR18CScriptPlayerActorR13CStateManageriif 801E4F10 LVAR 44 LR 801E4F10 LVAR 40 BPpop 801E4F10 LVAR -40 BPpush @@ -56099,7 +56102,7 @@ 8031BE10 COMM 0 0x00000038 8031BE14 COMM 0 0x00000001 8031BE2C COMM 0 0x00000002 -8031BEFC FUNC 4 sub_8031befc +8031BEFC FUNC 4 RenderBasicParticlesRotNoTS__11CElementGenFRC10CTransform 8031BEFC LVAR D4 LR 8031BEFC LVAR D0 BPpop 8031BEFC LVAR -D0 BPpush @@ -56125,7 +56128,7 @@ 8031C0A4 COMM 0 0xCC008000 8031C0A8 COMM 0 0xCC008000 8031C0AC COMM 0 0xCC008000 -8031C110 FUNC 4 sub_8031c110 +8031C110 FUNC 4 RenderBasicParticlesNoRotNoTS__11CElementGenFRC10CTransform 8031C110 LVAR 64 LR 8031C110 LVAR 60 BPpop 8031C110 LVAR -60 BPpush @@ -56151,7 +56154,7 @@ 8031C254 COMM 0 0xCC008000 8031C258 COMM 0 0xCC008000 8031C25C COMM 0 0xCC008000 -8031C288 FUNC 4 sub_8031c288 +8031C288 FUNC 4 RenderBasicParticlesRotTS__11CElementGenFRC10CTransform 8031C288 LVAR B4 LR 8031C288 LVAR B0 BPpop 8031C288 LVAR -B0 BPpush @@ -56177,7 +56180,7 @@ 8031C3CC COMM 0 0xCC008000 8031C3D0 COMM 0 0xCC008000 8031C3D4 COMM 0 0xCC008000 -8031C438 FUNC 4 sub_8031c438 +8031C438 FUNC 4 RenderBasicParticlesNoRotTS__11CElementGenFRC10CTransform 8031C438 LVAR 44 LR 8031C438 LVAR 40 BPpop 8031C438 LVAR -40 BPpush @@ -65366,9 +65369,12 @@ 80377F94 LVAR -8 BPpush 80377F98 COMM 0 switch 21 cases 80377FC8 COMM 0 switch jump +80377FCC COMM 0 case 0 80377FD8 COMM 0 case 1 +80377FF0 COMM 0 case 3 8037800C COMM 0 case 4 80378014 COMM 0 case 5 +8037801C COMM 0 case 6 80378108 COMM 0 0xCC008000 80378114 COMM 0 0xCC008000 80378120 COMM 0 0xCC008000 @@ -66149,6 +66155,7 @@ 8037C928 COMM 0 0xCC008000 8037C934 COMM 0 0xCC008000 8037C938 COMM 0 0xCC008000 +8037C940 COMM 0 case 1 8037C948 COMM 0 0xCC008000 8037C954 COMM 0 0xCC008000 8037C958 COMM 0 0xCC008000 @@ -66169,6 +66176,7 @@ 8037C9E8 COMM 0 0xCC008000 8037C9F4 COMM 0 0xCC008000 8037C9F8 COMM 0 0xCC008000 +8037CA00 COMM 0 case 7 8037CA08 COMM 0 0xCC008000 8037CA14 COMM 0 0xCC008000 8037CA18 COMM 0 0xCC008000 @@ -66181,6 +66189,7 @@ 8037CA68 COMM 0 0xCC008000 8037CA74 COMM 0 0xCC008000 8037CA78 COMM 0 0xCC008000 +8037CA80 COMM 0 case 10 8037CA88 COMM 0 0xCC008000 8037CA94 COMM 0 0xCC008000 8037CA98 COMM 0 0xCC008000 @@ -66195,9 +66204,11 @@ 8037CAE4 COMM 0 0xCC008000 8037CAE8 COMM 0 0x23009E7F 8037CAEC COMM 0 0xCC008000 +8037CAF4 COMM 0 case 14 8037CB00 COMM 0 0xCC008000 8037CB04 COMM 0 0x23001E7F 8037CB08 COMM 0 0xCC008000 +8037CB10 COMM 0 case 15 8037CB1C COMM 0 0xCC008000 8037CB20 COMM 0 0x2300AC3F 8037CB24 COMM 0 0xCC008000 @@ -66216,9 +66227,11 @@ 8037CB8C COMM 0 0xCC008000 8037CB90 COMM 0 0x2300AD3F 8037CB94 COMM 0 0xCC008000 +8037CB9C COMM 0 case 20 8037CBA8 COMM 0 0xCC008000 8037CBAC COMM 0 0x2300AD7F 8037CBB0 COMM 0 0xCC008000 +8037CBB8 COMM 0 case 21 8037CBC4 COMM 0 0xCC008000 8037CBC8 COMM 0 0x2300ADBF 8037CBCC COMM 0 0xCC008000 @@ -66285,6 +66298,7 @@ 8037CDE4 COMM 0 0xCC008000 8037CDE8 COMM 0 0x67000021 8037CDEC COMM 0 0xCC008000 +8037CDF4 COMM 0 case 4 8037CE00 COMM 0 0xCC008000 8037CE04 COMM 0 0x6700014B 8037CE08 COMM 0 0xCC008000 @@ -66347,8 +66361,10 @@ 8037CFD4 COMM 0 0xCC008000 8037CFD8 COMM 0 0x670004EC 8037CFDC COMM 0 0xCC008000 +8037CFE4 COMM 0 case 17 8037D004 COMM 0 case 19 8037D014 COMM 0 case 20 +8037D020 COMM 0 case 22 8037D030 FUNC 4 GXClearGPMetric 8037D040 FUNC 4 PSMTXIdentity 8037D06C FUNC 4 PSMTXCopy