Skip to content

CBeetle #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encounter merged 3 commits into from
Mar 20, 2026
Merged

CBeetle #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b960c52
Initial CBeetle
encounter Mar 13, 2026
2624ea2
Merge remote-tracking branch 'origin/main' into beetle
encounter Mar 20, 2026
f6b8b09
Some fixes
encounter Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/GM8E01_00/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,13 +624,14 @@ MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp:

MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp:
.text start:0x800E2784 end:0x800E2EDC
.rodata start:0x803CE5C8 end:0x803CE5F0
.rodata start:0x803CE5C8 end:0x803CE5D0
.data start:0x803DF870 end:0x803DF890
.sdata start:0x805A7330 end:0x805A7338
.sdata2 start:0x805AACC8 end:0x805AACE0

MetroidPrime/Enemies/CBeetle.cpp:
.text start:0x800E2EDC end:0x800E82D0
.rodata start:0x803CE5D0 end:0x803CE5F0
.data start:0x803DF890 end:0x803DFBF0
.sdata start:0x805A7338 end:0x805A7360
.sbss start:0x805A8EC0 end:0x805A8ED0
Expand Down
41 changes: 20 additions & 21 deletions config/GM8E01_00/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6025,18 +6025,18 @@ __ct__18CScriptRandomRelayF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_tra
reserve__Q24rstl82vector<Q24rstl38pair<P7CEntity,20EScriptObjectMessage>,Q24rstl17rmemory_allocator>Fi = .text:0x800E2DE8; // type:function size:0xF4 scope:global
GetSearchPath__7CBeetleFv = .text:0x800E2EDC; // type:function size:0x8 scope:global
NoPathNodes__7CBeetleFR13CStateManagerf = .text:0x800E2EE4; // type:function size:0x8 scope:global
PathShagged__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E2EEC; // type:function size:0x8 scope:global
PathShagged__7CBeetleFR13CStateManagerf = .text:0x800E2EEC; // type:function size:0x8 scope:global
IsListening__7CBeetleCFv = .text:0x800E2EF4; // type:function size:0x8 scope:global
GetGravityConstant__7CBeetleCFv = .text:0x800E2EFC; // type:function size:0x10 scope:global
RefinePathFindDest__7CBeetleFR13CStateManagerR9CVector3f = .text:0x800E2F0C; // type:function size:0x17C scope:global
PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes = .text:0x800E3088; // type:function size:0xFC scope:global
FindFurthestRetreatPoint__7CBeetleFR13CStateManager = .text:0x800E3184; // type:function size:0x16C scope:global
SetupRetreatPoints__7CBeetleFR13CStateManager = .text:0x800E32F0; // type:function size:0x10C scope:global
SeparateFromMelees__7CBeetleFR13CStateManager = .text:0x800E33FC; // type:function size:0x19C scope:global
GetOrigin__7CBeetleCFv = .text:0x800E3598; // type:function size:0x170 scope:global
GetOrigin__7CBeetleCFRC13CStateManagerRC11CTeamAiRoleRC9CVector3f = .text:0x800E3598; // type:function size:0x170 scope:global
SquadRemove__7CBeetleFR13CStateManager = .text:0x800E3708; // type:function size:0xA4 scope:global
SquadAdd__7CBeetleFR13CStateManager = .text:0x800E37AC; // type:function size:0x78 scope:global
Death__7CBeetleFRC9CVector3fR13CStateManager = .text:0x800E3824; // type:function size:0x120 scope:global
Death__7CBeetleFR13CStateManagerRC9CVector3f18EScriptObjectState = .text:0x800E3824; // type:function size:0x120 scope:global
Render__7CBeetleCFRC13CStateManager = .text:0x800E3944; // type:function size:0x140 scope:global
GetAimPosition__7CBeetleCFRC13CStateManagerf = .text:0x800E3A84; // type:function size:0x208 scope:global
TakeDamage__7CBeetleFRC9CVector3ff = .text:0x800E3C8C; // type:function size:0xC scope:global
Expand All @@ -6047,7 +6047,7 @@ Shock__7CBeetleFff = .text:0x800E3FA4; // type:function size:0x2A0 scope:global
Burn__7CBeetleFff = .text:0x800E4244; // type:function size:0x2A0 scope:global
CollidedWith__7CBeetleFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager = .text:0x800E44E4; // type:function size:0x158 scope:global
Think__7CBeetleFfR13CStateManager = .text:0x800E463C; // type:function size:0x1B8 scope:global
DoUserAnimEvent__7CBeetleFR13CStateManagerRC13CInt32POINode14EUserEventType = .text:0x800E47F4; // type:function size:0x2E0 scope:global
DoUserAnimEvent__7CBeetleFR13CStateManagerRC13CInt32POINode14EUserEventTypef = .text:0x800E47F4; // type:function size:0x2E0 scope:global
Retreat__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E4AD4; // type:function size:0x4F8 scope:global
PathFind__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E4FCC; // type:function size:0x2B0 scope:global
Taunt__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E527C; // type:function size:0x124 scope:global
Expand All @@ -6066,8 +6066,8 @@ ShouldDoubleSnap__7CBeetleFR13CStateManagerf = .text:0x800E5E1C; // type:functio
JumpBack__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E6108; // type:function size:0x134 scope:global
ShouldJumpBack__7CBeetleFR13CStateManagerf = .text:0x800E623C; // type:function size:0x1C0 scope:global
ShouldAttack__7CBeetleFR13CStateManagerf = .text:0x800E63FC; // type:function size:0xB8 scope:global
InAttackPosition__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E64B4; // type:function size:0xC0 scope:global
InRange__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E6574; // type:function size:0xE0 scope:global
InAttackPosition__7CBeetleFR13CStateManagerf = .text:0x800E64B4; // type:function size:0xC0 scope:global
InRange__7CBeetleFR13CStateManagerf = .text:0x800E6574; // type:function size:0xE0 scope:global
HasAttackPattern__7CBeetleFR13CStateManagerf = .text:0x800E6654; // type:function size:0x8 scope:global
FollowPattern__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E665C; // type:function size:0x248 scope:global
Attack__7CBeetleFR13CStateManager9EStateMsgf = .text:0x800E68A4; // type:function size:0x370 scope:global
Expand All @@ -6079,9 +6079,9 @@ AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager = .te
Accept__7CBeetleFR8IVisitor = .text:0x800E7A3C; // type:function size:0x38 scope:global
__dt__7CBeetleFv = .text:0x800E7A74; // type:function size:0x14C scope:global
__ct__7CBeetleF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned11EFlavorTypeQ27CBeetle13EEntranceTypeRC11CDamageInfoRC20CDamageVulnerabilityRC9CVector3ffffRC20CDamageVulnerabilityRC16CActorParametersRCQ24rstl29optional_object<10CStaticRes> = .text:0x800E7BC0; // type:function size:0x66C scope:global
fn_800E822C = .text:0x800E822C; // type:function size:0x44
fn_800E8270 = .text:0x800E8270; // type:function size:0x28
fn_800E8298 = .text:0x800E8298; // type:function size:0x38
__ct__Q24rstl29optional_object<10CModelData>FRCQ24rstl29optional_object<10CModelData> = .text:0x800E822C; // type:function size:0x44
construct<10CModelData>__4rstlFPvRC10CModelData = .text:0x800E8270; // type:function size:0x28
__ct__Q24rstl29optional_object<10CModelData>FRC10CModelData = .text:0x800E8298; // type:function size:0x38
__ct__13CHUDMemoParmsFR12CInputStream = .text:0x800E82D0; // type:function size:0x5C scope:global
Accept__14CScriptHUDMemoFR8IVisitor = .text:0x800E832C; // type:function size:0x38 scope:global
AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x800E8364; // type:function size:0x168 scope:global
Expand Down Expand Up @@ -6543,7 +6543,7 @@ __ct__12CPlayerVisorFRC13CStateManager = .text:0x801146CC; // type:function size
GetNumMaterialSets__10CModelDataCFv = .text:0x80114C48; // type:function size:0x3C scope:global
IsLoaded__10CModelDataCFi = .text:0x80114C84; // type:function size:0x138 scope:global
Render__10CModelDataCFRC13CStateManagerRC12CTransform4fPC12CActorLightsRC11CModelFlags = .text:0x80114DBC; // type:function size:0x6C scope:global
HasModel__10CModelDataCF11EWhichModel = .text:0x80114E28; // type:function size:0xB4 scope:global
HasModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80114E28; // type:function size:0xB4 scope:global
GetRenderingModel__10CModelDataFRC13CStateManager = .text:0x80114EDC; // type:function size:0x80 scope:global
PickAnimatedModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80114F5C; // type:function size:0x50 scope:global
PickStaticModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80114FAC; // type:function size:0x44 scope:global
Expand Down Expand Up @@ -10192,7 +10192,7 @@ SetImpulseDurationIdx__20CKnockBackControllerFi = .text:0x80233D8C; // type:func
SetAnimationStateRange__20CKnockBackControllerF24EKnockBackAnimationState24EKnockBackAnimationState = .text:0x80233D94; // type:function size:0xC scope:global
TestAvailableState__20CKnockBackControllerCFi = .text:0x80233DA0; // type:function size:0x24 scope:global
SetAvailableState__20CKnockBackControllerFib = .text:0x80233DC4; // type:function size:0x34 scope:global
__ct__20CKnockBackController2F17EKnockBackVariant = .text:0x80233DF8; // type:function size:0x1B8 scope:global
__ct__20CKnockBackControllerF17EKnockBackVariant = .text:0x80233DF8; // type:function size:0x1B8 scope:global
fn_80233FB0 = .text:0x80233FB0; // type:function size:0x4
GetAreaLayerCount__16CWorldLayerStateFRC7TAreaId = .text:0x80233FB4; // type:function size:0x14 scope:global
InitializeWorldLayers__16CWorldLayerStateFRCQ24rstl56vector<Q212CWorldLayers4Area,Q24rstl17rmemory_allocator> = .text:0x80233FC8; // type:function size:0x164 scope:global
Expand Down Expand Up @@ -11260,7 +11260,7 @@ fn_80282988 = .text:0x80282988; // type:function size:0x4C
erase__Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>FQ24rstl152pointer_iterator<Q24rstl22auto_ptr<10CModelData>,Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator<Q24rstl22auto_ptr<10CModelData>,Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x802829D4; // type:function size:0x10C scope:global
Clone__11IAnimReaderCFv = .text:0x80282AE0; // type:function size:0x38 scope:global
UpdateTransitionFilter__7CPlayerFfR13CStateManager = .text:0x80282B18; // type:function size:0x170 scope:global
InitializeBallTransition__7CPlayerFv = .text:0x80282C88; // type:function size:0x94 scope:global
InitialiseAnimation__7CPlayerFv = .text:0x80282C88; // type:function size:0x94 scope:global
LeaveMorphBallState__7CPlayerFR13CStateManager = .text:0x80282D1C; // type:function size:0x1D4 scope:global
EnterMorphBallState__7CPlayerFR13CStateManager = .text:0x80282EF0; // type:function size:0x13C scope:global
ActivateMorphBallCamera__7CPlayerFR13CStateManager = .text:0x8028302C; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -16811,7 +16811,7 @@ lbl_803CD2C8 = .rodata:0x803CD2C8; // type:object size:0x10 data:4byte
lbl_803CD2D8 = .rodata:0x803CD2D8; // type:object size:0x310
@stringBase0 = .rodata:0x803CD5E8; // type:object size:0xB scope:local data:string_table
lbl_803CD5F8 = .rodata:0x803CD5F8; // type:object size:0x7 data:string
lbl_803CD600 = .rodata:0x803CD600; // type:object size:0x28
@stringBase0 = .rodata:0x803CD600; // type:object size:0x26 scope:local data:string_table
lbl_803CD628 = .rodata:0x803CD628; // type:object size:0x7 data:string
@445 = .rodata:0x803CD630; // type:object size:0x10 scope:local data:4byte
MinesPostTransformIndices = .rodata:0x803CD640; // type:object size:0x2A scope:local
Expand Down Expand Up @@ -16992,8 +16992,7 @@ lbl_803CE568 = .rodata:0x803CE568; // type:object size:0x30
@stringBase0 = .rodata:0x803CE598; // type:object size:0x22 scope:local data:string_table
@stringBase0 = .rodata:0x803CE5C0; // type:object size:0x7 scope:local data:string_table
lbl_803CE5C8 = .rodata:0x803CE5C8; // type:object size:0x7 data:string
lbl_803CE5D0 = .rodata:0x803CE5D0; // type:object size:0xE data:string
lbl_803CE5DE = .rodata:0x803CE5DE; // type:object size:0xC data:string
@stringBase0 = .rodata:0x803CE5D0; // type:object size:0x1A scope:local data:string_table
sDoorData = .rodata:0x803CE5F0; // type:object size:0x60 scope:global
lbl_803CE650 = .rodata:0x803CE650; // type:object size:0x58
lbl_803CE6A8 = .rodata:0x803CE6A8; // type:object size:0x90
Expand Down Expand Up @@ -23050,8 +23049,8 @@ lbl_805AA5F4 = .sdata2:0x805AA5F4; // type:object size:0x4 align:4 data:float
lbl_805AA5F8 = .sdata2:0x805AA5F8; // type:object size:0x8 align:4 data:float
@518 = .sdata2:0x805AA600; // type:object size:0x4 scope:local align:4 data:float
@522 = .sdata2:0x805AA608; // type:object size:0x8 scope:local align:8 data:double
lbl_805AA610 = .sdata2:0x805AA610; // type:object size:0x4 align:4 data:float
lbl_805AA614 = .sdata2:0x805AA614; // type:object size:0x4 align:4 data:float
skDamageHitTime__10CPatterned = .sdata2:0x805AA610; // type:object size:0x4 scope:global align:4 data:float
skActorApproachDistance__10CPatterned = .sdata2:0x805AA614; // type:object size:0x4 scope:global align:4 data:float
lbl_805AA618 = .sdata2:0x805AA618; // type:object size:0x4
lbl_805AA61C = .sdata2:0x805AA61C; // type:object size:0x4 align:4 data:float
lbl_805AA620 = .sdata2:0x805AA620; // type:object size:0x4 align:4 data:float
Expand Down Expand Up @@ -23439,10 +23438,10 @@ lbl_805AACCC = .sdata2:0x805AACCC; // type:object size:0x4 align:4 data:float
lbl_805AACD0 = .sdata2:0x805AACD0; // type:object size:0x4 align:4 data:float
lbl_805AACD4 = .sdata2:0x805AACD4; // type:object size:0x4 align:4 data:float
lbl_805AACD8 = .sdata2:0x805AACD8; // type:object size:0x8 align:8 data:double
lbl_805AACE0 = .sdata2:0x805AACE0; // type:object size:0x4 data:4byte
lbl_805AACE4 = .sdata2:0x805AACE4; // type:object size:0x4 data:4byte
lbl_805AACE8 = .sdata2:0x805AACE8; // type:object size:0x4 data:4byte
lbl_805AACEC = .sdata2:0x805AACEC; // type:object size:0x4 align:4 data:float
kBiteLctrName = .sdata2:0x805AACE0; // type:object size:0x4 scope:local data:4byte
kDamageLctrName = .sdata2:0x805AACE4; // type:object size:0x4 scope:local data:4byte
kBetaLctrName = .sdata2:0x805AACE8; // type:object size:0x4 scope:local data:4byte
@4430 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local align:4 data:float
lbl_805AACF0 = .sdata2:0x805AACF0; // type:object size:0x4 align:4 data:float
lbl_805AACF4 = .sdata2:0x805AACF4; // type:object size:0x4 align:4 data:float
lbl_805AACF8 = .sdata2:0x805AACF8; // type:object size:0x4 align:4 data:float
Expand Down
3 changes: 2 additions & 1 deletion config/GM8E01_01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,13 +624,14 @@ MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp:

MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp:
.text start:0x800E2800 end:0x800E2F58
.rodata start:0x803CE7A8 end:0x803CE7D0
.rodata start:0x803CE7A8 end:0x803CE7B0
.data start:0x803DFA50 end:0x803DFA70
.sdata start:0x805A7510 end:0x805A7518
.sdata2 start:0x805AAEA8 end:0x805AAEC0

MetroidPrime/Enemies/CBeetle.cpp:
.text start:0x800E2F58 end:0x800E834C
.rodata start:0x803CE7B0 end:0x803CE7D0
.data start:0x803DFA70 end:0x803DFDD0
.sdata start:0x805A7518 end:0x805A7540
.sbss start:0x805A90A0 end:0x805A90B0
Expand Down
13 changes: 6 additions & 7 deletions config/GM8E01_01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6033,10 +6033,10 @@ PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes = .text:0x800E3104; // ty
FindFurthestRetreatPoint__7CBeetleFR13CStateManager = .text:0x800E3200; // type:function size:0x16C scope:global
SetupRetreatPoints__7CBeetleFR13CStateManager = .text:0x800E336C; // type:function size:0x10C scope:global
SeparateFromMelees__7CBeetleFR13CStateManager = .text:0x800E3478; // type:function size:0x19C scope:global
GetOrigin__7CBeetleCFv = .text:0x800E3614; // type:function size:0x170 scope:global
GetOrigin__7CBeetleCFRC13CStateManagerRC11CTeamAiRoleRC9CVector3f = .text:0x800E3614; // type:function size:0x170 scope:global
SquadRemove__7CBeetleFR13CStateManager = .text:0x800E3784; // type:function size:0xA4 scope:global
SquadAdd__7CBeetleFR13CStateManager = .text:0x800E3828; // type:function size:0x78 scope:global
Death__7CBeetleFRC9CVector3fR13CStateManager = .text:0x800E38A0; // type:function size:0x120 scope:global
Death__7CBeetleFR13CStateManagerRC9CVector3f18EScriptObjectState = .text:0x800E38A0; // type:function size:0x120 scope:global
Render__7CBeetleCFRC13CStateManager = .text:0x800E39C0; // type:function size:0x140 scope:global
GetAimPosition__7CBeetleCFRC13CStateManagerf = .text:0x800E3B00; // type:function size:0x208 scope:global
TakeDamage__7CBeetleFRC9CVector3ff = .text:0x800E3D08; // type:function size:0xC scope:global
Expand Down Expand Up @@ -6543,7 +6543,7 @@ __ct__12CPlayerVisorFRC13CStateManager = .text:0x80114748; // type:function size
GetNumMaterialSets__10CModelDataCFv = .text:0x80114CC4; // type:function size:0x3C scope:global
IsLoaded__10CModelDataCFi = .text:0x80114D00; // type:function size:0x138 scope:global
Render__10CModelDataCFRC13CStateManagerRC12CTransform4fPC12CActorLightsRC11CModelFlags = .text:0x80114E38; // type:function size:0x6C scope:global
HasModel__10CModelDataCF11EWhichModel = .text:0x80114EA4; // type:function size:0xB4 scope:global
HasModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80114EA4; // type:function size:0xB4 scope:global
GetRenderingModel__10CModelDataFRC13CStateManager = .text:0x80114F58; // type:function size:0x80 scope:global
PickAnimatedModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80114FD8; // type:function size:0x50 scope:global
PickStaticModel__10CModelDataCFQ210CModelData11EWhichModel = .text:0x80115028; // type:function size:0x44 scope:global
Expand Down Expand Up @@ -10192,7 +10192,7 @@ SetImpulseDurationIdx__20CKnockBackControllerFi = .text:0x80233E08; // type:func
SetAnimationStateRange__20CKnockBackControllerF24EKnockBackAnimationState24EKnockBackAnimationState = .text:0x80233E10; // type:function size:0xC scope:global
TestAvailableState__20CKnockBackControllerCFi = .text:0x80233E1C; // type:function size:0x24 scope:global
SetAvailableState__20CKnockBackControllerFib = .text:0x80233E40; // type:function size:0x34 scope:global
__ct__20CKnockBackController2F17EKnockBackVariant = .text:0x80233E74; // type:function size:0x1B8 scope:global
__ct__20CKnockBackControllerF17EKnockBackVariant = .text:0x80233E74; // type:function size:0x1B8 scope:global
nullsub_5 = .text:0x8023402C; // type:function size:0x4 scope:global
GetAreaLayerCount__16CWorldLayerStateFRC7TAreaId = .text:0x80234030; // type:function size:0x14 scope:global
InitializeWorldLayers__16CWorldLayerStateFRCQ24rstl56vector<Q212CWorldLayers4Area,Q24rstl17rmemory_allocator> = .text:0x80234044; // type:function size:0x164 scope:global
Expand Down Expand Up @@ -11260,7 +11260,7 @@ fn_80282988 = .text:0x80282A04; // type:function size:0x4C scope:global
erase__Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>FQ24rstl152pointer_iterator<Q24rstl22auto_ptr<10CModelData>,Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator<Q24rstl22auto_ptr<10CModelData>,Q24rstl66vector<Q24rstl22auto_ptr<10CModelData>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x80282A50; // type:function size:0x10C scope:global
Clone__11IAnimReaderCFv = .text:0x80282B5C; // type:function size:0x38 scope:global
UpdateTransitionFilter__7CPlayerFfR13CStateManager = .text:0x80282B94; // type:function size:0x170 scope:global
InitializeBallTransition__7CPlayerFv = .text:0x80282D04; // type:function size:0x94 scope:global
InitialiseAnimation__7CPlayerFv = .text:0x80282D04; // type:function size:0x94 scope:global
LeaveMorphBallState__7CPlayerFR13CStateManager = .text:0x80282D98; // type:function size:0x1D4 scope:global
EnterMorphBallState__7CPlayerFR13CStateManager = .text:0x80282F6C; // type:function size:0x13C scope:global
ActivateMorphBallCamera__7CPlayerFR13CStateManager = .text:0x802830A8; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -16992,8 +16992,7 @@ lbl_803CE748 = .rodata:0x803CE748; // type:object size:0x30
@stringBase0 = .rodata:0x803CE778; // type:object size:0x22 scope:local data:string_table
@stringBase0 = .rodata:0x803CE7A0; // type:object size:0x7 scope:local data:string_table
lbl_803CE7A8 = .rodata:0x803CE7A8; // type:object size:0x7 data:string
lbl_803CE7B0 = .rodata:0x803CE7B0; // type:object size:0xE data:string
lbl_803CE7BE = .rodata:0x803CE7BE; // type:object size:0xC data:string
@stringBase0 = .rodata:0x803CE7B0; // type:object size:0x1A scope:local data:string_table
lbl_803CE7D0 = .rodata:0x803CE7D0; // type:object size:0x60
lbl_803CE830 = .rodata:0x803CE830; // type:object size:0x58
lbl_803CE888 = .rodata:0x803CE888; // type:object size:0x90
Expand Down
2 changes: 2 additions & 0 deletions include/MetroidPrime/BodyState/CBodyController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ class CBodyController {
int GetCurrentAnimId() const { return x2f8_curAnim; }
void SetTurnSpeed(float speed);
bool IsAnimationOver() const { return x300_24_animationOver; }
bool GetIsActive() const { return x300_25_active; }
bool ShouldPlayDeathAnims() const { return x300_28_playDeathAnims; }
pas::EAnimationState GetCurrentStateId() const { return x2a4_bodyStateInfo.GetCurrentStateId(); }
float GetRestrictedFlyerMoveSpeed() const { return x330_restrictedFlyerMoveSpeed; }
void SetRestrictedFlyerMoveSpeed(float speed) { x330_restrictedFlyerMoveSpeed = speed; }

Expand Down
Loading
Loading