primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Continued work on CActor

Browse Source 
Former-commit-id: 09dfe946fc
This commit is contained in:
Luke Street
2022-08-15 00:51:06 -04:00
parent e9704b7718
commit 94e27faee8
97 changed files with 234 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/MetroidPrime/CActor.s
+3 -3
View File
@@ -32,7 +32,7 @@ __vt__6CActor:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.global lbl_803D9F1C
lbl_803D9F1C:
@@ -2946,8 +2946,8 @@ lbl_8005520C:
/* 80055214 00052174 38 21 00 10 */ addi r1, r1, 0x10
/* 80055218 00052178 4E 80 00 20 */ blr
.global DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType:
.global DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef:
/* 8005521C 0005217C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80055220 00052180 7C 08 02 A6 */ mflr r0
/* 80055224 00052184 2C 06 00 02 */ cmpwi r6, 2
asm/MetroidPrime/CCollisionActor.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_803E4B18:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte sub_801a8ea4
.4byte GetPrimitiveTransform__15CCollisionActorCFv
.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager
asm/MetroidPrime/CEffect.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803DA118:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.section .sdata
asm/MetroidPrime/CExplosion.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803DA0A8:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.section .sdata2, "a"
asm/MetroidPrime/CGameLight.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803DF3B8:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.section .sdata
asm/MetroidPrime/CGameProjectile.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803D9CE0:
.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
.section .sdata
asm/MetroidPrime/CPhysicsActor.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803E0628:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte GetCollisionPrimitive__13CPhysicsActorCFv
.4byte GetPrimitiveTransform__13CPhysicsActorCFv
.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager
asm/MetroidPrime/Cameras/CBallCamera.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_803DAB90:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ProcessInput__11CBallCameraFRC11CFinalInputR13CStateManager
.4byte Reset__11CBallCameraFRC12CTransform4fR13CStateManager
asm/MetroidPrime/Cameras/CCinematicCamera.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803DADF8:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ProcessInput__16CCinematicCameraFRC11CFinalInputR13CStateManager
.4byte Reset__16CCinematicCameraFRC12CTransform4fR13CStateManager
.4byte 0
asm/MetroidPrime/Cameras/CFirstPersonCamera.s
+1 -1
View File
@@ -31,7 +31,7 @@ lbl_803D9660:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager
.4byte Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager
.4byte 0
asm/MetroidPrime/Cameras/CGameCamera.s
+1 -1
View File
@@ -38,7 +38,7 @@ lbl_803DA194:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.4byte 0
asm/MetroidPrime/Cameras/CInterpolationCamera.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803E9D80:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager
.4byte Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager
.4byte 0
asm/MetroidPrime/Cameras/CPathCamera.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_803E0C68:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ProcessInput__11CPathCameraFRC11CFinalInputR13CStateManager
.4byte Reset__11CPathCameraFRC12CTransform4fR13CStateManager
.4byte 0
asm/MetroidPrime/Enemies/CActorContraption.s
+1 -1
View File
@@ -163,7 +163,7 @@ lbl_8023F4C4:
/* 8023F4C4 0023C424 7F 83 E3 78 */ mr r3, r28
/* 8023F4C8 0023C428 7F A4 EB 78 */ mr r4, r29
/* 8023F4CC 0023C42C 7F C5 F3 78 */ mr r5, r30
/* 8023F4D0 0023C430 4B E1 5D 4D */ bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
/* 8023F4D0 0023C430 4B E1 5D 4D */ bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
lbl_8023F4D4:
/* 8023F4D4 0023C434 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8023F4D8 0023C438 83 E1 00 1C */ lwz r31, 0x1c(r1)
asm/MetroidPrime/Enemies/CAi.s
+1 -1
View File
@@ -901,7 +901,7 @@ lbl_803DBCCC:
.4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte GetCollisionPrimitive__13CPhysicsActorCFv
.4byte GetPrimitiveTransform__13CPhysicsActorCFv
.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager
asm/MetroidPrime/Enemies/CAmbientAI.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803E8CB0:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte GetCollisionPrimitive__13CPhysicsActorCFv
.4byte GetPrimitiveTransform__13CPhysicsActorCFv
.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager
asm/MetroidPrime/Enemies/CBouncyGrenade.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803E7ED0:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte GetCollisionPrimitive__13CPhysicsActorCFv
.4byte GetPrimitiveTransform__13CPhysicsActorCFv
.4byte sub_8022ea58
asm/MetroidPrime/Enemies/CDrone.s
+1 -1
View File
@@ -281,7 +281,7 @@ lbl_803E3A58:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.section .sdata
asm/MetroidPrime/Enemies/CFlaahgra.s
+2 -2
View File
@@ -39,7 +39,7 @@ lbl_803E4D08:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.global lbl_803E4D74
lbl_803E4D74:
@@ -330,7 +330,7 @@ lbl_803E5154:
.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager
.4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
asm/MetroidPrime/Enemies/CFlaahgraPlants.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_803E6FD8:
.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
.4byte GetSortingBounds__6CActorCFRC12CTransform4f
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
.4byte 0
.section .sdata

Some files were not shown because too many files have changed in this diff Show More