diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index e062e67a..49c3c971 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -13,7 +13,7 @@ __vt__6CActor: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager @@ -1087,8 +1087,8 @@ lbl_8005381C: /* 80053844 000507A4 38 21 00 60 */ addi r1, r1, 0x60 /* 80053848 000507A8 4E 80 00 20 */ blr -.global SetActive__6CActorFUc -SetActive__6CActorFUc: +.global SetActive__6CActorFb +SetActive__6CActorFb: /* 8005384C 000507AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80053850 000507B0 7C 08 02 A6 */ mflr r0 /* 80053854 000507B4 38 C0 00 01 */ li r6, 1 @@ -1105,7 +1105,7 @@ SetActive__6CActorFUc: /* 80053880 000507E0 88 03 00 E7 */ lbz r0, 0xe7(r3) /* 80053884 000507E4 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80053888 000507E8 98 03 00 E7 */ stb r0, 0xe7(r3) -/* 8005388C 000507EC 4B FF D8 1D */ bl SetActive__7CEntityFUc +/* 8005388C 000507EC 4B FF D8 1D */ bl SetActive__7CEntityFb /* 80053890 000507F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053894 000507F4 7C 08 03 A6 */ mtlr r0 /* 80053898 000507F8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index 08814535..4ceefc86 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -17,7 +17,7 @@ lbl_803E4B18: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__15CCollisionActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 66305aa9..a26d8337 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -13,7 +13,7 @@ __vt__7CEffect: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CEffectCFRC13CStateManager diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index 9eb38724..bb8b3ed5 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -17,7 +17,7 @@ __vt__7CEntity: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .bss .balign 8 @@ -41,8 +41,8 @@ lbl_8005109C: /* 800510A0 0004E000 90 03 00 00 */ stw r0, 0(r3) /* 800510A4 0004E004 4E 80 00 20 */ blr -.global SetActive__7CEntityFUc -SetActive__7CEntityFUc: +.global SetActive__7CEntityFb +SetActive__7CEntityFb: /* 800510A8 0004E008 88 03 00 30 */ lbz r0, 0x30(r3) /* 800510AC 0004E00C 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800510B0 0004E010 98 03 00 30 */ stb r0, 0x30(r3) diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index f2610677..097678d5 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -13,7 +13,7 @@ __vt__10CExplosion: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CExplosionFfR13CStateManager .4byte AcceptScriptMsg__10CExplosionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CExplosionFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CExplosionCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CExplosionCFRC13CStateManager diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 71e10d41..1aff2b67 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -13,7 +13,7 @@ __vt__10CGameLight: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CGameLightFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index a8d93c5f..766a05aa 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -13,7 +13,7 @@ lbl_803D9CE0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 0b493854..ae877e38 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -13,7 +13,7 @@ __vt__13CPhysicsActor: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 4dbc639a..ef8a2ea6 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -496,7 +496,7 @@ SetActive__11CGameCameraFb: /* 8005B314 00058274 90 01 00 14 */ stw r0, 0x14(r1) /* 8005B318 00058278 93 E1 00 0C */ stw r31, 0xc(r1) /* 8005B31C 0005827C 7C 7F 1B 78 */ mr r31, r3 -/* 8005B320 00058280 4B FF 85 2D */ bl SetActive__6CActorFUc +/* 8005B320 00058280 4B FF 85 2D */ bl SetActive__6CActorFb /* 8005B324 00058284 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 8005B328 00058288 38 60 00 00 */ li r3, 0 /* 8005B32C 0005828C 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index 558271c9..cf022d02 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -13,7 +13,7 @@ lbl_803E85E8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CActorContraptionFfR13CStateManager .4byte AcceptScriptMsg__17CActorContraptionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index baf7432b..62516816 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -882,7 +882,7 @@ lbl_803DBCCC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__3CAiF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s index 854028f8..90ec3a6c 100644 --- a/asm/MetroidPrime/Enemies/CAmbientAI.s +++ b/asm/MetroidPrime/Enemies/CAmbientAI.s @@ -13,7 +13,7 @@ __vt__10CAmbientAI: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CAmbientAIFfR13CStateManager .4byte AcceptScriptMsg__10CAmbientAIF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s index 0c58a9e3..2a1af499 100644 --- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s +++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s @@ -13,7 +13,7 @@ lbl_803E88A8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CAtomicAlphaFfR13CStateManager .4byte AcceptScriptMsg__12CAtomicAlphaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CAtomicAlphaCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CAtomicAlphaCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index 9fc17b67..eff3dcbf 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -20,7 +20,7 @@ lbl_803E8E4C: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CAtomicBetaFfR13CStateManager .4byte AcceptScriptMsg__11CAtomicBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 7c880f84..d1e8457c 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -20,7 +20,7 @@ lbl_803E7350: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CBabygothFfR13CStateManager .4byte AcceptScriptMsg__9CBabygothF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__9CBabygothFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CBabygothCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index ec6c9135..c0162b3c 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -13,7 +13,7 @@ lbl_803DF890: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CBeetleFfR13CStateManager .4byte AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CBeetleCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 71c09883..349856af 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -27,7 +27,7 @@ lbl_803E0350: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CBloodFlowerFfR13CStateManager .4byte AcceptScriptMsg__12CBloodFlowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CBloodFlowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index 0e541b90..e43df16e 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -13,7 +13,7 @@ lbl_803E7ED0: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_8022ee5c .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte sub_8022e898 .4byte sub_8022e960 diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index 254b82fc..471d2b5a 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -48,7 +48,7 @@ lbl_803EA7C4: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CBurrowerFfR13CStateManager .4byte AcceptScriptMsg__9CBurrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__9CBurrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CBurrowerFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index ec3156bb..a6624973 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -46,7 +46,7 @@ lbl_803E1918: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CChozoGhostFfR13CStateManager .4byte AcceptScriptMsg__11CChozoGhostF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__11CChozoGhostFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CChozoGhostCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 37340b88..b0f51275 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -14,7 +14,7 @@ lbl_803E36A8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__6CDroneFfR13CStateManager .4byte AcceptScriptMsg__6CDroneF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CDroneFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CDroneCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CDroneCFRC13CStateManager @@ -262,7 +262,7 @@ lbl_803E3A58: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CDroneLaserFfR13CStateManager .4byte AcceptScriptMsg__11CDroneLaserF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CDroneLaserCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 692fa20f..4e396998 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -22,7 +22,7 @@ lbl_803E7AE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CElitePirateFfR13CStateManager .4byte AcceptScriptMsg__12CElitePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12CElitePirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index dd8c8b6a..0fd8ad09 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -20,7 +20,7 @@ lbl_803E774C: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CEyeBallFfR13CStateManager .4byte AcceptScriptMsg__8CEyeBallF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__8CEyeBallFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CEyeBallCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index a12f1034..09005278 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -17,7 +17,7 @@ lbl_803E1C88: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CFireFleaFfR13CStateManager .4byte AcceptScriptMsg__9CFireFleaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -200,7 +200,7 @@ lbl_803E1F54: .4byte PreThink__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager .4byte Think__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .4byte 0 .section .sdata diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 4f14be95..4a021818 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -21,7 +21,7 @@ lbl_803E4D08: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CFlaahgraRendererCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager @@ -129,7 +129,7 @@ lbl_803E4E88: .4byte PreThink__9CFlaahgraFfR13CStateManager .4byte Think__9CFlaahgraFfR13CStateManager .4byte AcceptScriptMsg__9CFlaahgraF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__9CFlaahgraCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -312,7 +312,7 @@ lbl_803E5154: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__19CFlaahgraProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index 3dad1476..75741c6f 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -13,7 +13,7 @@ lbl_803E6FD8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CFlaahgraPlantsFfR13CStateManager .4byte AcceptScriptMsg__15CFlaahgraPlantsF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index df0e5e8e..6b9e7763 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -13,7 +13,7 @@ lbl_803E6408: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__17CFlaahgraTentacleFfR13CStateManager .4byte AcceptScriptMsg__17CFlaahgraTentacleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index 7866163c..ce8785b5 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -13,7 +13,7 @@ lbl_803E0DE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CFlickerBatFfR13CStateManager .4byte AcceptScriptMsg__11CFlickerBatF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CFlickerBatCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index 5beebb20..bc562b5e 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -82,7 +82,7 @@ __vt__13CFlyingPirate: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__13CFlyingPirateFfR13CStateManager .4byte AcceptScriptMsg__13CFlyingPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__13CFlyingPirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CFlyingPirateCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index de0b2877..bad90c87 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -16,7 +16,7 @@ lbl_803E7F58: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CGrenadeLauncherFfR13CStateManager .4byte AcceptScriptMsg__16CGrenadeLauncherF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__16CGrenadeLauncherFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CGrenadeLauncherCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CGrenadeLauncherCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index e24ac2b0..bf27c635 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -17,7 +17,7 @@ lbl_803E4728: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CIceSheegothFfR13CStateManager .4byte AcceptScriptMsg__12CIceSheegothF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CIceSheegothCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CIceSheegothCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index 2ce4c25b..2ef0826e 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -34,7 +34,7 @@ lbl_803E5954: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CJellyZapFfR13CStateManager .4byte AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 3a6d0eec..bf9361db 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -101,7 +101,7 @@ lbl_803E8240: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CMagdoliteFfR13CStateManager .4byte AcceptScriptMsg__10CMagdoliteF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CMagdoliteCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index d9782593..614811d6 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -13,7 +13,7 @@ __vt__8CMetaree: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CMetareeFfR13CStateManager .4byte AcceptScriptMsg__8CMetareeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index f75fef5a..768c2c03 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -17,7 +17,7 @@ lbl_803E3AD8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CMetroidFfR13CStateManager .4byte AcceptScriptMsg__8CMetroidF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CMetroidCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index d71598b9..69b2b5f0 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -21,7 +21,7 @@ lbl_803E5388: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CMetroidBetaFfR13CStateManager .4byte AcceptScriptMsg__12CMetroidBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CMetroidBetaCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CMetroidBetaCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index cd9cfa99..eba84146 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -66,7 +66,7 @@ lbl_803EB244: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__20CMetroidPrimeEssenceFfR13CStateManager .4byte AcceptScriptMsg__20CMetroidPrimeEssenceF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__20CMetroidPrimeEssenceFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__20CMetroidPrimeEssenceCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CMetroidPrimeEssenceCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 9553fc6a..34643d93 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -254,7 +254,7 @@ lbl_803EAD54: .4byte PreThink__16CMetroidPrimeExoFfR13CStateManager .4byte Think__16CMetroidPrimeExoFfR13CStateManager .4byte AcceptScriptMsg__16CMetroidPrimeExoF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CMetroidPrimeExoCFRC13CStateManager @@ -496,7 +496,7 @@ lbl_803EB0FC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s index 5ddfb30d..e468f93b 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s @@ -13,7 +13,7 @@ __vt__23CMetroidPrimeProjectile: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index c38f6e76..a98a7538 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -13,7 +13,7 @@ lbl_803EB638: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CMetroidPrimeRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index fd0caea4..6f5de6aa 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -13,7 +13,7 @@ lbl_803E4018: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__13CNewIntroBossFfR13CStateManager .4byte AcceptScriptMsg__13CNewIntroBossF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CNewIntroBossCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index ed1a38a6..28048b42 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -13,7 +13,7 @@ lbl_803EB6C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__Q212COmegaPirate6CFlashFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__Q212COmegaPirate6CFlashFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager .4byte Render__Q212COmegaPirate6CFlashCFRC13CStateManager @@ -133,7 +133,7 @@ lbl_803EB868: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12COmegaPirateFfR13CStateManager .4byte AcceptScriptMsg__12COmegaPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12COmegaPirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12COmegaPirateCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index ec8c5e35..bf352ccc 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -24,7 +24,7 @@ lbl_803E3004: .4byte PreThink__9CParasiteFfR13CStateManager .4byte Think__9CParasiteFfR13CStateManager .4byte AcceptScriptMsg__9CParasiteF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CParasiteCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index d94c662e..b517204b 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -17,7 +17,7 @@ lbl_803DA5C8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CPatternedFfR13CStateManager .4byte AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index b3e69a62..a2c77100 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -13,7 +13,7 @@ lbl_803EBC70: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__20CPhazonHealingNoduleFfR13CStateManager .4byte AcceptScriptMsg__20CPhazonHealingNoduleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CPhazonHealingNoduleCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s index d92851ee..fbd2cc78 100644 --- a/asm/MetroidPrime/Enemies/CPhazonPool.s +++ b/asm/MetroidPrime/Enemies/CPhazonPool.s @@ -12,7 +12,7 @@ lbl_803EBB48: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CPhazonPoolFfR13CStateManager .4byte AcceptScriptMsg__11CPhazonPoolF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CPhazonPoolCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CPhazonPoolCFRC13CStateManager @@ -901,7 +901,7 @@ lbl_80293154: /* 80293158 002900B8 7F C3 F3 78 */ mr r3, r30 /* 8029315C 002900BC 90 1E 01 DC */ stw r0, 0x1dc(r30) /* 80293160 002900C0 38 80 00 00 */ li r4, 0 -/* 80293164 002900C4 4B DC 06 E9 */ bl SetActive__6CActorFUc +/* 80293164 002900C4 4B DC 06 E9 */ bl SetActive__6CActorFb lbl_80293168: /* 80293168 002900C8 7F C3 F3 78 */ mr r3, r30 /* 8029316C 002900CC 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index b2fcfc6f..81f3d793 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -41,7 +41,7 @@ lbl_803E20C4: .4byte PreThink__12CPuddleSporeFfR13CStateManager .4byte Think__12CPuddleSporeFfR13CStateManager .4byte AcceptScriptMsg__12CPuddleSporeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CPuddleSporeCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 97239ae9..7de2c6d6 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -17,7 +17,7 @@ lbl_803E24E0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__16CPuddleToadGammaFfR13CStateManager .4byte AcceptScriptMsg__16CPuddleToadGammaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index e2bba476..0fccfba5 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -49,7 +49,7 @@ __vt__7CPuffer: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CPufferFfR13CStateManager .4byte AcceptScriptMsg__7CPufferF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index fe55da06..52f339de 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -130,7 +130,7 @@ lbl_803E9258: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CRidleyR13CStateManager .4byte AcceptScriptMsg__7CRidleyF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__7CRidleyFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CRidleyCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 5e6fdf80..3b8885a1 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -13,7 +13,7 @@ lbl_803E3348: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CRipperFfR13CStateManager .4byte AcceptScriptMsg__7CRipperF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index ee2d6f1b..7703232b 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -13,7 +13,7 @@ __vt__25CRipperControlledPlatform: .4byte PreThink__15CScriptPlatformFfR13CStateManager .4byte Think__15CScriptPlatformFfR13CStateManager .4byte AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptPlatformCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index 10f09bde..041d7c2f 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -27,7 +27,7 @@ lbl_803E9E10: .4byte PreThink__11CWallWalkerFfR13CStateManager .4byte Think__9CSeedlingFfR13CStateManager .4byte AcceptScriptMsg__9CSeedlingF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CSeedlingCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index 6f1f9b16..fa499e33 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -13,7 +13,7 @@ lbl_803E8578: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CSnakeWeedSwarmFfR13CStateManager .4byte AcceptScriptMsg__15CSnakeWeedSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__15CSnakeWeedSwarmFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CSnakeWeedSwarmCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index b57195bb..b33c93bb 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -141,7 +141,7 @@ lbl_803E0800: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CSpacePirateFfR13CStateManager .4byte AcceptScriptMsg__12CSpacePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12CSpacePirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CSpacePirateCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index 5298971c..25e9c11a 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -13,7 +13,7 @@ lbl_803E2D28: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CSpankWeedFfR13CStateManager .4byte AcceptScriptMsg__10CSpankWeedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CSpankWeedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 45343ee7..a450cc14 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -13,7 +13,7 @@ lbl_803E8558: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CTeamAiMgrFfR13CStateManager .4byte AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 16cf56c6..55a484ae 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -19,7 +19,7 @@ lbl_803E5CE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CThardusFfR13CStateManager .4byte AcceptScriptMsg__8CThardusF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__8CThardusFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CThardusCFRC13CStateManager @@ -260,7 +260,7 @@ lbl_803E6074: .4byte PreThink__16CDestroyableRockFfR13CStateManager .4byte Think__16CDestroyableRockFfR13CStateManager .4byte AcceptScriptMsg__16CDestroyableRockF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__16CDestroyableRockFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CDestroyableRockCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 75b1d7dd..c0b16318 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -13,7 +13,7 @@ lbl_803E6BE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__22CThardusRockProjectileFfR13CStateManager .4byte AcceptScriptMsg__22CThardusRockProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__22CThardusRockProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index e4caf764..5e46b54e 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -45,7 +45,7 @@ lbl_803E9A40: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CTryclopsFfR13CStateManager .4byte sub_80260bf0 - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 943d3507..a5f17089 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -13,7 +13,7 @@ lbl_803E6308: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CWallCrawlerSwarmFfR13CStateManager .4byte AcceptScriptMsg__17CWallCrawlerSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__17CWallCrawlerSwarmFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CWallCrawlerSwarmCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 87f8fcbd..f7744774 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -13,7 +13,7 @@ lbl_803EA0F0: .4byte PreThink__11CWallWalkerFfR13CStateManager .4byte Think__11CWallWalkerFfR13CStateManager .4byte AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CWallWalkerCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 1cf562d0..61f8f575 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -13,7 +13,7 @@ lbl_803DFF90: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CWarWaspFfR13CStateManager .4byte AcceptScriptMsg__8CWarWaspF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index bf0630da..6813ba84 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -16,7 +16,7 @@ lbl_803D96E8: .4byte PreThink__7CPlayerFfR13CStateManager .4byte Think__7CPlayerFfR13CStateManager .4byte AcceptScriptMsg__7CPlayerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__7CPlayerFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CPlayerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CPlayerCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 17eb52cd..ffede9b4 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -13,7 +13,7 @@ lbl_803EC0A0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CEnergyBallFfR13CStateManager .4byte AcceptScriptMsg__11CEnergyBallF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -197,7 +197,7 @@ lbl_803EC370: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_802a0164 .4byte sub_802a0100 - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 72a09bdf..7d943549 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -13,7 +13,7 @@ lbl_803E9990: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__5CFireFfR13CStateManager .4byte AcceptScriptMsg__5CFireF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte Render__5CFireCFRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index f2ad4387..72f447d1 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -13,7 +13,7 @@ lbl_803E5758: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CFishCloudFfR13CStateManager .4byte AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CFishCloudCFRC13CStateManager @@ -44,7 +44,7 @@ lbl_803E57C4: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CFishCloudModifierF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index 2272c3cb..e88f1c10 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -13,7 +13,7 @@ __vt__19CHUDBillboardEffect: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__19CHUDBillboardEffectFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__19CHUDBillboardEffectFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__19CHUDBillboardEffectCFRC14CFrustumPlanesRC13CStateManager .4byte Render__19CHUDBillboardEffectCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index d35f865a..49335bb5 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -13,7 +13,7 @@ __vt__9CRepulsor: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__9CRepulsorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index b3cd311d..0f249b2a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -13,7 +13,7 @@ lbl_803DA450: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptActorFfR13CStateManager .4byte AcceptScriptMsg__12CScriptActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s index 64bd1f4b..c204b55a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s @@ -13,7 +13,7 @@ __vt__20CScriptActorKeyframe: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptActorKeyframeFfR13CStateManager .4byte AcceptScriptMsg__20CScriptActorKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .global __vt__14CBCScriptedCmd __vt__14CBCScriptedCmd: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s index 2b56b30f..91c3a87c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s @@ -13,7 +13,7 @@ __vt__18CScriptActorRotate: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptActorRotateFfR13CStateManager .4byte AcceptScriptMsg__18CScriptActorRotateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index 41fdd9f3..b272c49d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -13,7 +13,7 @@ __vt__18CScriptAiJumpPoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptAiJumpPointFfR13CStateManager .4byte AcceptScriptMsg__18CScriptAiJumpPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__18CScriptAiJumpPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__18CScriptAiJumpPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s index 8e037f0c..bac55879 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s @@ -13,7 +13,7 @@ __vt__21CScriptAreaAttributes: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index 45d4221d..eb371ba9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -13,7 +13,7 @@ __vt__18CScriptBallTrigger: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptBallTriggerFfR13CStateManager .4byte AcceptScriptMsg__18CScriptBallTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index d080971e..e9403722 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -13,7 +13,7 @@ __vt__11CScriptBeam: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptBeamFfR13CStateManager .4byte AcceptScriptMsg__11CScriptBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s index ee174122..e3b51f3d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s @@ -13,7 +13,7 @@ __vt__25CScriptCameraBlurKeyframe: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__25CScriptCameraBlurKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s index b7d47dea..58c994d3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s @@ -13,7 +13,7 @@ __vt__27CScriptCameraFilterKeyframe: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__27CScriptCameraFilterKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index 3bf4fdaa..74aa6680 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -13,7 +13,7 @@ lbl_803DF688: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptCameraHintF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index 4febac24..e7ca863d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -13,7 +13,7 @@ __vt__24CScriptCameraHintTrigger: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__24CScriptCameraHintTriggerFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index 581afad9..d3a1304b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -19,7 +19,7 @@ __vt__24CScriptCameraPitchVolume: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__24CScriptCameraPitchVolumeFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index 3fde3222..4b1795ae 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -13,7 +13,7 @@ __vt__19CScriptCameraShaker: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__19CScriptCameraShakerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index ed017fd9..52f4674b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -13,7 +13,7 @@ __vt__21CScriptCameraWaypoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptCameraWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__21CScriptCameraWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__21CScriptCameraWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index 8057de42..b1e01c24 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -12,7 +12,7 @@ lbl_803E6BB0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptColorModulateFfR13CStateManager .4byte AcceptScriptMsg__20CScriptColorModulateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s index 880c6ab1..ecc54e1d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s @@ -13,7 +13,7 @@ __vt__23CScriptControllerAction: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__23CScriptControllerActionFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s index 0f828565..a39646b6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s @@ -13,7 +13,7 @@ __vt__14CScriptCounter: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__14CScriptCounterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .global lbl_803DAF10 lbl_803DAF10: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index 1a4655d3..04211e9f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -13,7 +13,7 @@ __vt__17CScriptCoverPoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CScriptCoverPointFfR13CStateManager .4byte AcceptScriptMsg__17CScriptCoverPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CScriptCoverPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CScriptCoverPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index ad697577..0f6246ea 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -13,7 +13,7 @@ lbl_803DFD08: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__24CScriptDamageableTriggerFfR13CStateManager .4byte AcceptScriptMsg__24CScriptDamageableTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__24CScriptDamageableTriggerFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__24CScriptDamageableTriggerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__24CScriptDamageableTriggerCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index 023cdaa5..cafc578b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -13,7 +13,7 @@ lbl_803DFD78: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptDebrisFfR13CStateManager .4byte AcceptScriptMsg__13CScriptDebrisF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__13CScriptDebrisFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CScriptDebrisCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CScriptDebrisCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 7f35e514..5916148b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -12,7 +12,7 @@ lbl_803E23C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s index 30f1b030..204c4327 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s @@ -13,7 +13,7 @@ __vt__18CScriptDistanceFog: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index 5362f8eb..cd164ebf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -13,7 +13,7 @@ lbl_803DF580: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptDockFfR13CStateManager .4byte AcceptScriptMsg__11CScriptDockF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s index 87bfd6c0..bc8f3d4a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s @@ -13,7 +13,7 @@ __vt__21CScriptDockAreaChange: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptDockAreaChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 63d96401..2055a059 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -13,7 +13,7 @@ lbl_803DAA78: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptDoorFfR13CStateManager .4byte AcceptScriptMsg__11CScriptDoorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CScriptDoorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CScriptDoorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index cc0c916d..59c9e2f6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -13,7 +13,7 @@ __vt__14CScriptEMPulse: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__14CScriptEMPulseFfR13CStateManager .4byte AcceptScriptMsg__14CScriptEMPulseF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__14CScriptEMPulseCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 817505b5..36e84497 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -195,7 +195,7 @@ SetActive__13CScriptEffectFb: /* 8008DB78 0008AAD8 90 01 00 14 */ stw r0, 0x14(r1) /* 8008DB7C 0008AADC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8008DB80 0008AAE0 7C 7F 1B 78 */ mr r31, r3 -/* 8008DB84 0008AAE4 4B FC 5C C9 */ bl SetActive__6CActorFUc +/* 8008DB84 0008AAE4 4B FC 5C C9 */ bl SetActive__6CActorFb /* 8008DB88 0008AAE8 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 8008DB8C 0008AAEC 38 60 00 01 */ li r3, 1 /* 8008DB90 0008AAF0 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index 6ef9e1da..839a926c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -13,7 +13,7 @@ __vt__16CScriptGenerator: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__16CScriptGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 3c73ecd6..ed16cbbd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -13,7 +13,7 @@ __vt__19CScriptGrapplePoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__19CScriptGrapplePointFfR13CStateManager .4byte AcceptScriptMsg__19CScriptGrapplePointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__19CScriptGrapplePointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__19CScriptGrapplePointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index a06c1efa..b3c4f971 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -28,7 +28,7 @@ lbl_803E71EC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CScriptGunTurretFfR13CStateManager .4byte AcceptScriptMsg__16CScriptGunTurretF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CScriptGunTurretCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CScriptGunTurretCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s index e56af590..cafea8b8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s @@ -13,7 +13,7 @@ __vt__14CScriptHUDMemo: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 4d972da3..4b7000fd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -15,7 +15,7 @@ lbl_803EB658: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CScriptMazeNodeFfR13CStateManager .4byte AcceptScriptMsg__15CScriptMazeNodeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s index 6719e08d..5eff4554 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s @@ -13,7 +13,7 @@ __vt__18CScriptMemoryRelay: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptMemoryRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s index a15dabce..29c8063b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s @@ -13,7 +13,7 @@ __vt__11CScriptMidi: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 0460f190..5d4cf027 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -13,7 +13,7 @@ lbl_803DF4F8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptPickupFfR13CStateManager .4byte AcceptScriptMsg__13CScriptPickupF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CScriptPickupCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index fa00ce24..8da0b824 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -13,7 +13,7 @@ __vt__22CScriptPickupGenerator: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__22CScriptPickupGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 60f5fb26..502ab070 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -13,7 +13,7 @@ __vt__15CScriptPlatform: .4byte PreThink__15CScriptPlatformFfR13CStateManager .4byte Think__15CScriptPlatformFfR13CStateManager .4byte AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptPlatformCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 08577fe6..596b289e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -351,7 +351,7 @@ SetActive__18CScriptPlayerActorFb: /* 801AA5F0 001A7550 90 01 00 14 */ stw r0, 0x14(r1) /* 801AA5F4 001A7554 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AA5F8 001A7558 7C 7F 1B 78 */ mr r31, r3 -/* 801AA5FC 001A755C 4B EA 92 51 */ bl SetActive__6CActorFUc +/* 801AA5FC 001A755C 4B EA 92 51 */ bl SetActive__6CActorFb /* 801AA600 001A7560 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 801AA604 001A7564 38 60 00 01 */ li r3, 1 /* 801AA608 001A7568 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index 7c7be2eb..33365ac9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -13,7 +13,7 @@ __vt__17CScriptPlayerHint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptPlayerHintF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s index 77e85755..3a832fd9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s @@ -12,7 +12,7 @@ __vt__24CScriptPlayerStateChange: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__24CScriptPlayerStateChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index 9d8bddbb..6e91df1e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -13,7 +13,7 @@ __vt__22CScriptPointOfInterest: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptPointOfInterestFfR13CStateManager .4byte AcceptScriptMsg__22CScriptPointOfInterestF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptPointOfInterestCFRC14CFrustumPlanesRC13CStateManager .4byte Render__22CScriptPointOfInterestCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index 996e74ce..67789aed 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -13,7 +13,7 @@ __vt__22CScriptShadowProjector: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptShadowProjectorFfR13CStateManager .4byte AcceptScriptMsg__22CScriptShadowProjectorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__22CScriptShadowProjectorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptShadowProjectorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s index 8084a28f..253c4279 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s @@ -13,7 +13,7 @@ __vt__18CScriptRandomRelay: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s index 45027e89..5f9dcd4c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s @@ -13,7 +13,7 @@ __vt__12CScriptRelay: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptRelayFfR13CStateManager .4byte AcceptScriptMsg__12CScriptRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s index 8a62f886..09425943 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s @@ -13,7 +13,7 @@ __vt__13CScriptRipple: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptRippleFfR13CStateManager .4byte AcceptScriptMsg__13CScriptRippleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s index f96a67c2..cc3a4bd9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s @@ -17,7 +17,7 @@ __vt__20CScriptRoomAcoustics: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptRoomAcousticsFfR13CStateManager .4byte AcceptScriptMsg__20CScriptRoomAcousticsF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 64679b7b..85879c01 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -13,7 +13,7 @@ lbl_803DF128: .4byte PreThink__12CScriptSoundFfR13CStateManager .4byte Think__12CScriptSoundFfR13CStateManager .4byte AcceptScriptMsg__12CScriptSoundF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CScriptSoundCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s index b37e6ec5..6184c680 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s @@ -13,7 +13,7 @@ __vt__17CScriptSpawnPoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptSpawnPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index d36cdced..69344836 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -13,7 +13,7 @@ lbl_803E2B68: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptSpecialFunctionFfR13CStateManager .4byte AcceptScriptMsg__22CScriptSpecialFunctionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__22CScriptSpecialFunctionFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptSpecialFunctionFRC14CFrustumPlanesR13CStateManager .4byte Render__22CScriptSpecialFunctionFR13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index 69ad4f90..97257c52 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -13,7 +13,7 @@ __vt__34CScriptSpiderBallAttractionSurface: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__34CScriptSpiderBallAttractionSurfaceFfR13CStateManager .4byte AcceptScriptMsg__34CScriptSpiderBallAttractionSurfaceF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index 94a3fb30..00f847b2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -13,7 +13,7 @@ lbl_803E02C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__25CScriptSpiderBallWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__25CScriptSpiderBallWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__25CScriptSpiderBallWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s index 87d17c54..51267cf8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s @@ -13,7 +13,7 @@ __vt__12CScriptSteam: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptSteamFfR13CStateManager .4byte AcceptScriptMsg__12CScriptSteamF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s index d78b4e38..c7c8ceba 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s @@ -13,7 +13,7 @@ __vt__20CScriptStreamedMusic: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .global lbl_803E7088 lbl_803E7088: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s index c193c2c4..cc43f334 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s @@ -13,7 +13,7 @@ lbl_803E5C40: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__13CScriptSwitchF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index 41439a08..a2aa1189 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -13,7 +13,7 @@ __vt__21CScriptTargetingPoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__21CScriptTargetingPointFfR13CStateManager .4byte AcceptScriptMsg__21CScriptTargetingPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__21CScriptTargetingPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__21CScriptTargetingPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s index 17dd8e07..f6f0f4b2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s @@ -13,7 +13,7 @@ __vt__12CScriptTimer: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptTimerFfR13CStateManager .4byte AcceptScriptMsg__12CScriptTimerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index 1a77df83..bbdd6ddd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -13,7 +13,7 @@ __vt__14CScriptTrigger: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__14CScriptTriggerFfR13CStateManager .4byte AcceptScriptMsg__14CScriptTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index b2bf710c..cd5f8b01 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -13,7 +13,7 @@ __vt__17CScriptVisorFlare: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CScriptVisorFlareFfR13CStateManager .4byte AcceptScriptMsg__17CScriptVisorFlareF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__17CScriptVisorFlareFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CScriptVisorFlareCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CScriptVisorFlareCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 57607a2f..d846f8df 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -13,7 +13,7 @@ __vt__15CScriptVisorGoo: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CScriptVisorGooFfR13CStateManager .4byte AcceptScriptMsg__15CScriptVisorGooF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CScriptVisorGooCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptVisorGooCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 4ca9cf2d..2d98ca80 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -13,7 +13,7 @@ lbl_803DFE70: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptWaterFfR13CStateManager .4byte AcceptScriptMsg__12CScriptWaterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CScriptWaterCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CScriptWaterCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index edac96da..a013eccf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -13,7 +13,7 @@ __vt__15CScriptWaypoint: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__15CScriptWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CScriptWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index be8f2f30..feca9889 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -13,7 +13,7 @@ __vt__22CScriptWorldTeleporter: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__22CScriptWorldTeleporterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFUc + .4byte SetActive__7CEntityFb .section .text, "ax" diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index 53bd706d..07f997a0 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -13,7 +13,7 @@ __vt__15CBeamProjectile: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 07b65830..7ba65879 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -13,7 +13,7 @@ lbl_803DACC0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__5CBombFfR13CStateManager .4byte AcceptScriptMsg__5CBombF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__5CBombCFRC14CFrustumPlanesRC13CStateManager .4byte nullsub_99 diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index 1c752dfc..b2e6479a 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -13,7 +13,7 @@ __vt__23CElectricBeamProjectile: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__23CElectricBeamProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__23CElectricBeamProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index f0fef93b..aee15193 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -17,7 +17,7 @@ __vt__17CEnergyProjectile: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index a67714b9..198c1633 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -17,7 +17,7 @@ lbl_803E45D8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CFlameThrowerFfR13CStateManager .4byte AcceptScriptMsg__13CFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CFlameThrowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 51de495f..226091eb 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -13,7 +13,7 @@ lbl_803E51E8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CIceImpactFfR13CStateManager .4byte AcceptScriptMsg__10CIceImpactF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__10CIceImpactFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CIceImpactCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CIceImpactCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 6d2f2134..d5c7e233 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -13,7 +13,7 @@ lbl_803E6778: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CIceAttackProjectileFfR13CStateManager .4byte AcceptScriptMsg__20CIceAttackProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__20CIceAttackProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CIceAttackProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index 3abe8e26..decc4ff2 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -17,7 +17,7 @@ lbl_803E9D10: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CNewFlameThrowerFfR13CStateManager .4byte AcceptScriptMsg__16CNewFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CNewFlameThrowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 0e4a69e2..1483272d 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -17,7 +17,7 @@ lbl_803E3F00: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__17CPlasmaProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CPlasmaProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index e0e101e5..e52dc6a7 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -17,7 +17,7 @@ lbl_803E2808: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CPowerBombFfR13CStateManager .4byte AcceptScriptMsg__10CPowerBombF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPowerBombCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPowerBombCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index beb1c1ac..3d2570b1 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -13,7 +13,7 @@ lbl_803E8050: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CShockwaveFfR13CStateManager .4byte AcceptScriptMsg__10CShockwaveF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CShockwaveCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CShockwaveCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 02bebfa0..6e2cfdbb 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -14,7 +14,7 @@ __vt__21CTargetableProjectile: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index de159055..6f85c443 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -17,7 +17,7 @@ lbl_803E5318: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_801bef28 .4byte sub_801bebcc - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte sub_801bee04 .4byte sub_801bedb8 diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index abf52567..0a94ebe3 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -13,7 +13,7 @@ __vt__7CWeapon: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFUc + .4byte SetActive__6CActorFb .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CWeaponCFRC13CStateManager diff --git a/include/Collision/CCollidableSphere.hpp b/include/Collision/CCollidableSphere.hpp index d503fba9..68470a74 100644 --- a/include/Collision/CCollidableSphere.hpp +++ b/include/Collision/CCollidableSphere.hpp @@ -12,11 +12,11 @@ public: CCollidableSphere(const CSphere& sphere, const CMaterialList& material) : CCollisionPrimitive(material), x10_sphere(sphere) {} - uint GetTableIndex() const override; - CAABox CalculateAABox(const CTransform4f&) const override; - CAABox CalculateLocalAABox() const override; - FourCC GetPrimType() const override; - ~CCollidableSphere() override {} + uint GetTableIndex() const; + CAABox CalculateAABox(const CTransform4f&) const; + CAABox CalculateLocalAABox() const; + FourCC GetPrimType() const; + ~CCollidableSphere() {} CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const; private: diff --git a/include/GuiSys/CGuiCompoundWidget.hpp b/include/GuiSys/CGuiCompoundWidget.hpp index 337baf74..e85012be 100644 --- a/include/GuiSys/CGuiCompoundWidget.hpp +++ b/include/GuiSys/CGuiCompoundWidget.hpp @@ -5,10 +5,10 @@ class CGuiCompoundWidget : public CGuiWidget { public: - FourCC GetWidgetTypeID() const override { return -1; } + FourCC GetWidgetTypeID() const { return -1; } - void OnVisible() override; - void OnActivate() override; + void OnVisible(); + void OnActivate(); virtual CGuiWidget* GetWorkerWidget(int id) const; private: }; diff --git a/include/GuiSys/CGuiGroup.hpp b/include/GuiSys/CGuiGroup.hpp index f139874b..0b08d165 100644 --- a/include/GuiSys/CGuiGroup.hpp +++ b/include/GuiSys/CGuiGroup.hpp @@ -5,13 +5,13 @@ class CGuiGroup : public CGuiCompoundWidget { public: - FourCC GetWidgetTypeID() const override { return 'GRUP'; } + FourCC GetWidgetTypeID() const { return 'GRUP'; } void SelectWorkerWidget(int workerId, bool setActive, bool setVisible); CGuiWidget* GetSelectedWidget(); const CGuiWidget* GetSelectedWidget() const; - bool AddWorkerWidget(CGuiWidget* worker) override; - void OnActivate() override; + bool AddWorkerWidget(CGuiWidget* worker); + void OnActivate(); private: uint xb8_workerCount; diff --git a/include/GuiSys/CGuiModel.hpp b/include/GuiSys/CGuiModel.hpp index 710bebc0..0073b275 100644 --- a/include/GuiSys/CGuiModel.hpp +++ b/include/GuiSys/CGuiModel.hpp @@ -14,10 +14,10 @@ public: bool flag); const TLockedToken< CModel >& GetModel() const { return xb8_model; } - bool GetIsFinishedLoadingWidgetSpecific() const override; - void Touch() const override; - void Draw(const CGuiWidgetDrawParms& parms) const override; - // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; + bool GetIsFinishedLoadingWidgetSpecific() const; + void Touch() const; + void Draw(const CGuiWidgetDrawParms& parms) const; + // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const; private: TLockedToken< CModel > xb8_model; diff --git a/include/GuiSys/CGuiPane.hpp b/include/GuiSys/CGuiPane.hpp index 529b849a..8465ad08 100644 --- a/include/GuiSys/CGuiPane.hpp +++ b/include/GuiSys/CGuiPane.hpp @@ -7,7 +7,7 @@ class CGuiPane : public CGuiWidget { public: CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter); - void Draw(const CGuiWidgetDrawParms& parms) const override; + void Draw(const CGuiWidgetDrawParms& parms) const; virtual void ScaleDimensions(const CVector3f& scale); virtual void SetDimensions(const CVector2f& dim, bool initVBO); virtual CVector2f GetDimensions() const; diff --git a/include/GuiSys/CGuiTextPane.hpp b/include/GuiSys/CGuiTextPane.hpp index f16a1b02..e230986b 100644 --- a/include/GuiSys/CGuiTextPane.hpp +++ b/include/GuiSys/CGuiTextPane.hpp @@ -19,12 +19,12 @@ public: CGuiTextSupport& TextSupport() { return xd4_textSupport; } const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; } - void Update(float dt) override; - bool GetIsFinishedLoadingWidgetSpecific() const override; - void SetDimensions(const CVector2f& dim, bool initVBO) override; - void ScaleDimensions(const CVector3f& scale) override; - void Draw(const CGuiWidgetDrawParms& parms) const override; - // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override; + void Update(float dt); + bool GetIsFinishedLoadingWidgetSpecific() const; + void SetDimensions(const CVector2f& dim, bool initVBO); + void ScaleDimensions(const CVector3f& scale); + void Draw(const CGuiWidgetDrawParms& parms) const; + // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const; private: CGuiTextSupport xd4_textSupport; diff --git a/include/Kyoto/Alloc/CGameAllocator.hpp b/include/Kyoto/Alloc/CGameAllocator.hpp index eea7123b..ff742574 100644 --- a/include/Kyoto/Alloc/CGameAllocator.hpp +++ b/include/Kyoto/Alloc/CGameAllocator.hpp @@ -70,23 +70,23 @@ public: bool Initialize(COsContext& ctx); void Shutdown(); - void* Alloc(size_t size, EHint hint, EScope scope, EType type, const CCallStack& cs) override; + void* Alloc(size_t size, EHint hint, EScope scope, EType type, const CCallStack& cs); SGameMemInfo* FindFreeBlock(uint); SGameMemInfo* FindFreeBlockFromTopOfHeap(uint); uint FixupAllocPtrs(SGameMemInfo*, uint, uint, EHint, const CCallStack&); void UpdateAllocDebugStats(unsigned int, unsigned int, unsigned int); - bool Free(const void* ptr) override; + bool Free(const void* ptr); bool FreeNormalAllocation(const void* ptr); - void ReleaseAll() override; + void ReleaseAll(); void* AllocSecondary(size_t size, EHint hint, EScope scope, EType type, - const CCallStack& cs) override; - bool FreeSecondary(const void* ptr) override; - void ReleaseAllSecondary() override; - void SetOutOfMemoryCallback(FOutOfMemoryCb cb, const void* target) override; - int EnumAllocations(FEnumAllocationsCb func, const void* ptr, bool b) const override; - SAllocInfo GetAllocInfo(const void* ptr) const override; - SMetrics GetMetrics() const override; - void OffsetFakeStatics(int offset) override; + const CCallStack& cs); + bool FreeSecondary(const void* ptr); + void ReleaseAllSecondary(); + void SetOutOfMemoryCallback(FOutOfMemoryCb cb, const void* target); + int EnumAllocations(FEnumAllocationsCb func, const void* ptr, bool b) const; + SAllocInfo GetAllocInfo(const void* ptr) const; + SMetrics GetMetrics() const; + void OffsetFakeStatics(int offset); static uint GetFreeBinEntryForSize(uint); void AddFreeEntryToFreeList(SGameMemInfo*); diff --git a/include/Kyoto/Input/CDolphinController.hpp b/include/Kyoto/Input/CDolphinController.hpp index ea4d29ce..b4c40e12 100644 --- a/include/Kyoto/Input/CDolphinController.hpp +++ b/include/Kyoto/Input/CDolphinController.hpp @@ -11,12 +11,12 @@ class CDolphinController : public IController { public: CDolphinController(); - ~CDolphinController() override; - void Poll() override; - uint GetDeviceCount() const override; - CControllerGamepadData& GetGamepadData(int controller) override; - uint GetControllerType(int) const override; - void SetMotorState(EIOPort port, EMotorState state) override; + ~CDolphinController(); + void Poll(); + uint GetDeviceCount() const; + CControllerGamepadData& GetGamepadData(int controller); + uint GetControllerType(int) const; + void SetMotorState(EIOPort port, EMotorState state); bool Initialize(); float GetAnalogStickMaxValue(EJoyAxis axis) const; diff --git a/include/Kyoto/Particles/CColorElement.hpp b/include/Kyoto/Particles/CColorElement.hpp index 4bf917a5..a3c616b4 100644 --- a/include/Kyoto/Particles/CColorElement.hpp +++ b/include/Kyoto/Particles/CColorElement.hpp @@ -14,8 +14,8 @@ class CCEConstant : public CColorElement { public: CCEConstant(CRealElement* r, CRealElement* g, CRealElement* b, CRealElement* a); - ~CCEConstant() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEConstant(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCEFastConstant : public CColorElement { @@ -23,8 +23,8 @@ class CCEFastConstant : public CColorElement { public: CCEFastConstant(float r, float g, float b, float a); - ~CCEFastConstant() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEFastConstant(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCEFade : public CColorElement { @@ -34,8 +34,8 @@ class CCEFade : public CColorElement { public: CCEFade(CColorElement* a, CColorElement* b, CRealElement* end); - ~CCEFade() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEFade(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCEFadeEnd : public CColorElement { @@ -46,8 +46,8 @@ class CCEFadeEnd : public CColorElement { public: CCEFadeEnd(CColorElement* a, CColorElement* b, CRealElement* start, CRealElement* end); - ~CCEFadeEnd() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEFadeEnd(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCETimeChain : public CColorElement { @@ -57,8 +57,8 @@ class CCETimeChain : public CColorElement { public: CCETimeChain(CColorElement* a, CColorElement* b, CIntElement* c); - ~CCETimeChain() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCETimeChain(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCEPulse : public CColorElement { @@ -69,8 +69,8 @@ class CCEPulse : public CColorElement { public: CCEPulse(CIntElement* a, CIntElement* b, CColorElement* c, CColorElement* d); - ~CCEPulse() override; - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEPulse(); + bool GetValue(int frame, CColor& colorOut) const; }; class CCEKeyframeEmitter : public CColorElement { @@ -84,14 +84,14 @@ class CCEKeyframeEmitter : public CColorElement { public: CCEKeyframeEmitter(CInputStream& in); - ~CCEKeyframeEmitter() override; - bool GetValue(int frame, CColor& valOut) const override; + ~CCEKeyframeEmitter(); + bool GetValue(int frame, CColor& valOut) const; }; class CCEParticleColor : public CColorElement { public: - ~CCEParticleColor() override {} - bool GetValue(int frame, CColor& colorOut) const override; + ~CCEParticleColor() {} + bool GetValue(int frame, CColor& colorOut) const; }; #endif // _CCOLORELEMENT diff --git a/include/Kyoto/Particles/CElementGen.hpp b/include/Kyoto/Particles/CElementGen.hpp index fdc66e49..47df80d9 100644 --- a/include/Kyoto/Particles/CElementGen.hpp +++ b/include/Kyoto/Particles/CElementGen.hpp @@ -43,34 +43,34 @@ public: CElementGen(TToken< CGenDescription >, EModelOrientationType = kMOT_Normal, EOptionalSystemFlags = kOSF_One); - ~CElementGen() override; + ~CElementGen(); - virtual void Update(double) override; - virtual void Render() const override; - virtual void SetOrientation(const CTransform4f& orientation) override; - virtual void SetTranslation(const CVector3f& translation) override; - virtual void SetGlobalOrientation(const CTransform4f& orientation) override; - virtual void SetGlobalTranslation(const CVector3f& translation) override; - virtual void SetGlobalScale(const CVector3f& scale) override; - virtual void SetLocalScale(const CVector3f& scale) override; - virtual void SetParticleEmission(bool emission) override; - virtual void SetModulationColor(const CColor& col) override; - virtual void SetGeneratorRate(float rate) override {} - virtual const CTransform4f& GetOrientation() const override; - virtual const CVector3f& GetTranslation() const override; - virtual CTransform4f GetGlobalOrientation() const override; - virtual CVector3f GetGlobalTranslation() const override; - virtual CVector3f GetGlobalScale() const override; - virtual bool GetParticleEmission() const override; - virtual CColor GetModulationColor() const override; - virtual bool IsSystemDeletable() const override; - virtual rstl::optional_object GetBounds() const override; - virtual int GetParticleCount() const override; - virtual bool SystemHasLight() const override; - virtual CLight GetLight() override; - virtual void DestroyParticles() override; - virtual void AddModifier(CWarp*) override; - virtual uint Get4CharId() const override; + virtual void Update(double); + virtual void Render() const; + virtual void SetOrientation(const CTransform4f& orientation); + virtual void SetTranslation(const CVector3f& translation); + virtual void SetGlobalOrientation(const CTransform4f& orientation); + virtual void SetGlobalTranslation(const CVector3f& translation); + virtual void SetGlobalScale(const CVector3f& scale); + virtual void SetLocalScale(const CVector3f& scale); + virtual void SetParticleEmission(bool emission); + virtual void SetModulationColor(const CColor& col); + virtual void SetGeneratorRate(float rate) {} + virtual const CTransform4f& GetOrientation() const; + virtual const CVector3f& GetTranslation() const; + virtual CTransform4f GetGlobalOrientation() const; + virtual CVector3f GetGlobalTranslation() const; + virtual CVector3f GetGlobalScale() const; + virtual bool GetParticleEmission() const; + virtual CColor GetModulationColor() const; + virtual bool IsSystemDeletable() const; + virtual rstl::optional_object GetBounds() const; + virtual int GetParticleCount() const; + virtual bool SystemHasLight() const; + virtual CLight GetLight(); + virtual void DestroyParticles(); + virtual void AddModifier(CWarp*); + virtual uint Get4CharId() const; int GetEmitterTime() const; int GetSystemCount(); diff --git a/include/Kyoto/Particles/CIntElement.hpp b/include/Kyoto/Particles/CIntElement.hpp index bf6ddb97..31044c69 100644 --- a/include/Kyoto/Particles/CIntElement.hpp +++ b/include/Kyoto/Particles/CIntElement.hpp @@ -14,8 +14,8 @@ class CIEConstant : public CIntElement { public: CIEConstant(int val); - ~CIEConstant() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEConstant(); + bool GetValue(int frame, int& valOut) const; }; class CIEDeath : public CIntElement { @@ -24,8 +24,8 @@ class CIEDeath : public CIntElement { public: CIEDeath(CIntElement* a, CIntElement* b); - ~CIEDeath() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEDeath(); + bool GetValue(int frame, int& valOut) const; }; class CIEAdd : public CIntElement { @@ -34,8 +34,8 @@ class CIEAdd : public CIntElement { public: CIEAdd(CIntElement* a, CIntElement* b); - ~CIEAdd() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEAdd(); + bool GetValue(int frame, int& valOut) const; }; class CIEMultiply : public CIntElement { @@ -44,8 +44,8 @@ class CIEMultiply : public CIntElement { public: CIEMultiply(CIntElement* a, CIntElement* b); - ~CIEMultiply() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEMultiply(); + bool GetValue(int frame, int& valOut) const; }; class CIEModulo : public CIntElement { @@ -54,8 +54,8 @@ class CIEModulo : public CIntElement { public: CIEModulo(CIntElement* a, CIntElement* b); - ~CIEModulo() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEModulo(); + bool GetValue(int frame, int& valOut) const; }; class CIERandom : public CIntElement { @@ -64,8 +64,8 @@ class CIERandom : public CIntElement { public: CIERandom(CIntElement* a, CIntElement* b); - ~CIERandom() override; - bool GetValue(int frame, int& valOut) const override; + ~CIERandom(); + bool GetValue(int frame, int& valOut) const; }; class CIESampleAndHold : public CIntElement { @@ -77,8 +77,8 @@ class CIESampleAndHold : public CIntElement { public: CIESampleAndHold(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIESampleAndHold() override; - bool GetValue(int frame, int& valOut) const override; + ~CIESampleAndHold(); + bool GetValue(int frame, int& valOut) const; }; class CIEImpulse : public CIntElement { @@ -86,8 +86,8 @@ class CIEImpulse : public CIntElement { public: CIEImpulse(CIntElement* a); - ~CIEImpulse() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEImpulse(); + bool GetValue(int frame, int& valOut) const; }; class CIETimescale : public CIntElement { @@ -96,7 +96,7 @@ class CIETimescale : public CIntElement { public: CIETimescale(CRealElement* a); ~CIETimescale(); - bool GetValue(int frame, int& valOut) const override; + bool GetValue(int frame, int& valOut) const; }; class CIEInitialRandom : public CIntElement { @@ -105,8 +105,8 @@ class CIEInitialRandom : public CIntElement { public: CIEInitialRandom(CIntElement* a, CIntElement* b); - ~CIEInitialRandom() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEInitialRandom(); + bool GetValue(int frame, int& valOut) const; }; class CIETimeChain : public CIntElement { @@ -116,8 +116,8 @@ class CIETimeChain : public CIntElement { public: CIETimeChain(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIETimeChain() override; - bool GetValue(int frame, int& valOut) const override; + ~CIETimeChain(); + bool GetValue(int frame, int& valOut) const; }; class CIEClamp : public CIntElement { @@ -127,8 +127,8 @@ class CIEClamp : public CIntElement { public: CIEClamp(CIntElement* a, CIntElement* b, CIntElement* c); - ~CIEClamp() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEClamp(); + bool GetValue(int frame, int& valOut) const; }; class CIEPulse : public CIntElement { @@ -139,8 +139,8 @@ class CIEPulse : public CIntElement { public: CIEPulse(CIntElement* a, CIntElement* b, CIntElement* c, CIntElement* d); - ~CIEPulse() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEPulse(); + bool GetValue(int frame, int& valOut) const; }; class CIELifetimePercent : public CIntElement { @@ -148,8 +148,8 @@ class CIELifetimePercent : public CIntElement { public: CIELifetimePercent(CIntElement* a); - ~CIELifetimePercent() override; - bool GetValue(int frame, int& valOut) const override; + ~CIELifetimePercent(); + bool GetValue(int frame, int& valOut) const; }; class CIEKeyframeEmitter : public CIntElement { @@ -163,8 +163,8 @@ class CIEKeyframeEmitter : public CIntElement { public: CIEKeyframeEmitter(CInputStream& in); - ~CIEKeyframeEmitter() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEKeyframeEmitter(); + bool GetValue(int frame, int& valOut) const; }; class CIESubtract : public CIntElement { @@ -173,8 +173,8 @@ class CIESubtract : public CIntElement { public: CIESubtract(CIntElement* a, CIntElement* b); - ~CIESubtract() override; - bool GetValue(int frame, int& valOut) const override; + ~CIESubtract(); + bool GetValue(int frame, int& valOut) const; }; class CIERealToInt : public CIntElement { @@ -183,26 +183,26 @@ class CIERealToInt : public CIntElement { public: CIERealToInt(CRealElement* a, CRealElement* b); - ~CIERealToInt() override; - bool GetValue(int frame, int& valOut) const override; + ~CIERealToInt(); + bool GetValue(int frame, int& valOut) const; }; class CIEGetCumulativeParticleCount : public CIntElement { public: - ~CIEGetCumulativeParticleCount() override {} - bool GetValue(int frame, int& valOut) const override; + ~CIEGetCumulativeParticleCount() {} + bool GetValue(int frame, int& valOut) const; }; class CIEGetActiveParticleCount : public CIntElement { public: - ~CIEGetActiveParticleCount() override {} - bool GetValue(int frame, int& valOut) const override; + ~CIEGetActiveParticleCount() {} + bool GetValue(int frame, int& valOut) const; }; class CIEGetEmitterTime : public CIntElement { public: - ~CIEGetEmitterTime() override; - bool GetValue(int frame, int& valOut) const override; + ~CIEGetEmitterTime(); + bool GetValue(int frame, int& valOut) const; }; #endif // _CINTELEMENT diff --git a/include/Kyoto/Particles/CModVectorElement.hpp b/include/Kyoto/Particles/CModVectorElement.hpp index 74f4141a..2c232d0b 100644 --- a/include/Kyoto/Particles/CModVectorElement.hpp +++ b/include/Kyoto/Particles/CModVectorElement.hpp @@ -13,8 +13,8 @@ class CMVEConstant : public CModVectorElement { public: CMVEConstant(CRealElement* a, CRealElement* b, CRealElement* c); - ~CMVEConstant() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEConstant(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEFastConstant : public CModVectorElement { @@ -22,8 +22,8 @@ class CMVEFastConstant : public CModVectorElement { public: CMVEFastConstant(float a, float b, float c); - ~CMVEFastConstant() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEFastConstant(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEGravity : public CModVectorElement { @@ -31,8 +31,8 @@ class CMVEGravity : public CModVectorElement { public: CMVEGravity(CVectorElement* a); - ~CMVEGravity() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEGravity(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEWind : public CModVectorElement { @@ -41,8 +41,8 @@ class CMVEWind : public CModVectorElement { public: CMVEWind(CVectorElement* velocity, CRealElement* factor); - ~CMVEWind() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEWind(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEExplode : public CModVectorElement { @@ -51,8 +51,8 @@ class CMVEExplode : public CModVectorElement { public: CMVEExplode(CRealElement* a, CRealElement* b); - ~CMVEExplode() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEExplode(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVETimeChain : public CModVectorElement { @@ -62,8 +62,8 @@ class CMVETimeChain : public CModVectorElement { public: CMVETimeChain(CModVectorElement* a, CModVectorElement* b, CIntElement* c); - ~CMVETimeChain() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVETimeChain(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEPulse : public CModVectorElement { @@ -74,8 +74,8 @@ class CMVEPulse : public CModVectorElement { public: CMVEPulse(CIntElement* a, CIntElement* b, CModVectorElement* c, CModVectorElement* d); - ~CMVEPulse() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEPulse(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEImplosion : public CModVectorElement { @@ -87,8 +87,8 @@ class CMVEImplosion : public CModVectorElement { public: CMVEImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVEImplosion() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEImplosion(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVELinearImplosion : public CModVectorElement { @@ -100,8 +100,8 @@ class CMVELinearImplosion : public CModVectorElement { public: CMVELinearImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVELinearImplosion() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVELinearImplosion(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEExponentialImplosion : public CModVectorElement { @@ -114,8 +114,8 @@ class CMVEExponentialImplosion : public CModVectorElement { public: CMVEExponentialImplosion(CVectorElement* a, CRealElement* b, CRealElement* c, CRealElement* d, bool e); - ~CMVEExponentialImplosion() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEExponentialImplosion(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVESwirl : public CModVectorElement { @@ -126,8 +126,8 @@ class CMVESwirl : public CModVectorElement { public: CMVESwirl(CVectorElement* a, CVectorElement* b, CRealElement* c, CRealElement* d); - ~CMVESwirl() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVESwirl(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVEBounce : public CModVectorElement { @@ -143,8 +143,8 @@ class CMVEBounce : public CModVectorElement { public: CMVEBounce(CVectorElement* planePoint, CVectorElement* planeNormal, CRealElement* friction, CRealElement* restitution, bool e); - ~CMVEBounce() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVEBounce(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; class CMVESetPosition : public CModVectorElement { @@ -152,8 +152,8 @@ class CMVESetPosition : public CModVectorElement { public: CMVESetPosition(CVectorElement* a); - ~CMVESetPosition() override; - bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const override; + ~CMVESetPosition(); + bool GetValue(int frame, CVector3f& pVel, CVector3f& pPos) const; }; #endif // _CMODVECTORELEMENT diff --git a/include/Kyoto/Particles/CParticleElectric.hpp b/include/Kyoto/Particles/CParticleElectric.hpp index 127bc2aa..347496a8 100644 --- a/include/Kyoto/Particles/CParticleElectric.hpp +++ b/include/Kyoto/Particles/CParticleElectric.hpp @@ -11,33 +11,33 @@ class CParticleElectric : public CParticleGen { public: explicit CParticleElectric(TToken desc); - ~CParticleElectric() override; - void Update(double) override; - void Render() const override; - void SetOrientation(const CTransform4f& orientation) override; - void SetTranslation(const CVector3f& translation) override; - void SetGlobalOrientation(const CTransform4f& orientation) override; - void SetGlobalTranslation(const CVector3f& translation) override; - void SetGlobalScale(const CVector3f& scale) override; - void SetLocalScale(const CVector3f& scale) override; - void SetParticleEmission(bool emission) override; - void SetModulationColor(const CColor& col) override; + ~CParticleElectric(); + void Update(double); + void Render() const; + void SetOrientation(const CTransform4f& orientation); + void SetTranslation(const CVector3f& translation); + void SetGlobalOrientation(const CTransform4f& orientation); + void SetGlobalTranslation(const CVector3f& translation); + void SetGlobalScale(const CVector3f& scale); + void SetLocalScale(const CVector3f& scale); + void SetParticleEmission(bool emission); + void SetModulationColor(const CColor& col); void SetGeneratorRate(float rate) {} - const CTransform4f& GetOrientation() const override; - const CVector3f& GetTranslation() const override; - CTransform4f GetGlobalOrientation() const override; - CVector3f GetGlobalTranslation() const override; - CVector3f GetGlobalScale() const override; - bool GetParticleEmission() const override; - CColor GetModulationColor() const override; - bool IsSystemDeletable() const override; - rstl::optional_object GetBounds() const override; - int GetParticleCount() const override; - bool SystemHasLight() const override; - CLight GetLight() override; - void DestroyParticles() override; - void AddModifier(CWarp*) override; - uint Get4CharId() const override; + const CTransform4f& GetOrientation() const; + const CVector3f& GetTranslation() const; + CTransform4f GetGlobalOrientation() const; + CVector3f GetGlobalTranslation() const; + CVector3f GetGlobalScale() const; + bool GetParticleEmission() const; + CColor GetModulationColor() const; + bool IsSystemDeletable() const; + rstl::optional_object GetBounds() const; + int GetParticleCount() const; + bool SystemHasLight() const; + CLight GetLight(); + void DestroyParticles(); + void AddModifier(CWarp*); + uint Get4CharId() const; void SetOverrideIPos(const CVector3f& vec) { x178_overrideIPos = vec; } diff --git a/include/Kyoto/Particles/CRealElement.hpp b/include/Kyoto/Particles/CRealElement.hpp index 61c0259a..52bb560c 100644 --- a/include/Kyoto/Particles/CRealElement.hpp +++ b/include/Kyoto/Particles/CRealElement.hpp @@ -12,9 +12,9 @@ class CREConstant : public CRealElement { public: CREConstant(float val); - ~CREConstant() override; - bool GetValue(int frame, float& valOut) const override; - bool IsConstant() const override { return true; } + ~CREConstant(); + bool GetValue(int frame, float& valOut) const; + bool IsConstant() const { return true; } }; class CRESineWave : public CRealElement { @@ -24,8 +24,8 @@ class CRESineWave : public CRealElement { public: CRESineWave(CRealElement* a, CRealElement* b, CRealElement* c); - ~CRESineWave() override; - bool GetValue(int frame, float& valOut) const override; + ~CRESineWave(); + bool GetValue(int frame, float& valOut) const; }; class CRETimeScale : public CRealElement { @@ -33,8 +33,8 @@ class CRETimeScale : public CRealElement { public: CRETimeScale(CRealElement* a); - ~CRETimeScale() override; - bool GetValue(int frame, float& valOut) const override; + ~CRETimeScale(); + bool GetValue(int frame, float& valOut) const; }; class CREAdd : public CRealElement { @@ -43,8 +43,8 @@ class CREAdd : public CRealElement { public: CREAdd(CRealElement* a, CRealElement* b); - ~CREAdd() override; - bool GetValue(int frame, float& valOut) const override; + ~CREAdd(); + bool GetValue(int frame, float& valOut) const; }; class CREMultiply : public CRealElement { @@ -53,8 +53,8 @@ class CREMultiply : public CRealElement { public: CREMultiply(CRealElement* a, CRealElement* b); - ~CREMultiply() override; - bool GetValue(int frame, float& valOut) const override; + ~CREMultiply(); + bool GetValue(int frame, float& valOut) const; }; class CREDotProduct : public CRealElement { @@ -63,8 +63,8 @@ class CREDotProduct : public CRealElement { public: CREDotProduct(CVectorElement* a, CVectorElement* b); - ~CREDotProduct() override; - bool GetValue(int frame, float& valOut) const override; + ~CREDotProduct(); + bool GetValue(int frame, float& valOut) const; }; class CRERandom : public CRealElement { @@ -73,8 +73,8 @@ class CRERandom : public CRealElement { public: CRERandom(CRealElement* min, CRealElement* max); - ~CRERandom() override; - bool GetValue(int frame, float& valOut) const override; + ~CRERandom(); + bool GetValue(int frame, float& valOut) const; }; class CREInitialRandom : public CRealElement { @@ -83,9 +83,9 @@ class CREInitialRandom : public CRealElement { public: CREInitialRandom(CRealElement* min, CRealElement* max); - ~CREInitialRandom() override; - bool GetValue(int frame, float& valOut) const override; - bool IsConstant() const override { return true; } + ~CREInitialRandom(); + bool GetValue(int frame, float& valOut) const; + bool IsConstant() const { return true; } }; class CRETimeChain : public CRealElement { @@ -95,8 +95,8 @@ class CRETimeChain : public CRealElement { public: CRETimeChain(CRealElement* a, CRealElement* b, CIntElement* c); - ~CRETimeChain() override; - bool GetValue(int frame, float& valOut) const override; + ~CRETimeChain(); + bool GetValue(int frame, float& valOut) const; }; class CREClamp : public CRealElement { @@ -106,8 +106,8 @@ class CREClamp : public CRealElement { public: CREClamp(CRealElement* a, CRealElement* b, CRealElement* c); - ~CREClamp() override; - bool GetValue(int frame, float& valOut) const override; + ~CREClamp(); + bool GetValue(int frame, float& valOut) const; }; class CREPulse : public CRealElement { @@ -118,8 +118,8 @@ class CREPulse : public CRealElement { public: CREPulse(CIntElement* a, CIntElement* b, CRealElement* c, CRealElement* d); - ~CREPulse() override; - bool GetValue(int frame, float& valOut) const override; + ~CREPulse(); + bool GetValue(int frame, float& valOut) const; }; class CRELifetimePercent : public CRealElement { @@ -127,8 +127,8 @@ class CRELifetimePercent : public CRealElement { public: CRELifetimePercent(CRealElement* a); // : x4_percentVal(a) {} - ~CRELifetimePercent() override; - bool GetValue(int frame, float& valOut) const override; + ~CRELifetimePercent(); + bool GetValue(int frame, float& valOut) const; }; class CRELifetimeTween : public CRealElement { @@ -137,8 +137,8 @@ class CRELifetimeTween : public CRealElement { public: CRELifetimeTween(CRealElement* a, CRealElement* b); - ~CRELifetimeTween() override; - bool GetValue(int frame, float& valOut) const override; + ~CRELifetimeTween(); + bool GetValue(int frame, float& valOut) const; }; class CREKeyframeEmitter : public CRealElement { @@ -152,68 +152,68 @@ class CREKeyframeEmitter : public CRealElement { public: CREKeyframeEmitter(CInputStream& in); - ~CREKeyframeEmitter() override; - bool GetValue(int frame, float& valOut) const override; + ~CREKeyframeEmitter(); + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter1 : public CRealElement { public: - ~CREParticleAccessParameter1() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter1() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter2 : public CRealElement { public: - ~CREParticleAccessParameter2() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter2() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter3 : public CRealElement { public: - ~CREParticleAccessParameter3() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter3() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter4 : public CRealElement { public: - ~CREParticleAccessParameter4() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter4() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter5 : public CRealElement { public: - ~CREParticleAccessParameter5() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter5() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter6 : public CRealElement { public: - ~CREParticleAccessParameter6() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter6() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter7 : public CRealElement { public: - ~CREParticleAccessParameter7() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter7() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleAccessParameter8 : public CRealElement { public: - ~CREParticleAccessParameter8() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleAccessParameter8() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleSizeOrLineLength : public CRealElement { public: - ~CREParticleSizeOrLineLength() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleSizeOrLineLength() {} + bool GetValue(int frame, float& valOut) const; }; class CREParticleRotationOrLineWidth : public CRealElement { public: - ~CREParticleRotationOrLineWidth() override {} - bool GetValue(int frame, float& valOut) const override; + ~CREParticleRotationOrLineWidth() {} + bool GetValue(int frame, float& valOut) const; }; class CREVectorXToReal : public CRealElement { @@ -221,8 +221,8 @@ class CREVectorXToReal : public CRealElement { public: CREVectorXToReal(CVectorElement* a); - ~CREVectorXToReal() override; - bool GetValue(int frame, float& valOut) const override; + ~CREVectorXToReal(); + bool GetValue(int frame, float& valOut) const; }; class CREVectorYToReal : public CRealElement { @@ -230,8 +230,8 @@ class CREVectorYToReal : public CRealElement { public: CREVectorYToReal(CVectorElement* a); - ~CREVectorYToReal() override; - bool GetValue(int frame, float& valOut) const override; + ~CREVectorYToReal(); + bool GetValue(int frame, float& valOut) const; }; class CREVectorZToReal : public CRealElement { @@ -239,8 +239,8 @@ class CREVectorZToReal : public CRealElement { public: CREVectorZToReal(CVectorElement* a); - ~CREVectorZToReal() override; - bool GetValue(int frame, float& valOut) const override; + ~CREVectorZToReal(); + bool GetValue(int frame, float& valOut) const; }; class CREVectorMagnitude : public CRealElement { @@ -248,8 +248,8 @@ class CREVectorMagnitude : public CRealElement { public: CREVectorMagnitude(CVectorElement* a); - ~CREVectorMagnitude() override; - bool GetValue(int frame, float& valOut) const override; + ~CREVectorMagnitude(); + bool GetValue(int frame, float& valOut) const; }; class CREInitialSwitch : public CRealElement { @@ -258,8 +258,8 @@ class CREInitialSwitch : public CRealElement { public: CREInitialSwitch(CRealElement* a, CRealElement* b); - ~CREInitialSwitch() override; - bool GetValue(int frame, float& valOut) const override; + ~CREInitialSwitch(); + bool GetValue(int frame, float& valOut) const; }; class CRECompareLessThan : public CRealElement { @@ -270,8 +270,8 @@ class CRECompareLessThan : public CRealElement { public: CRECompareLessThan(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d); - ~CRECompareLessThan() override; - bool GetValue(int frame, float& valOut) const override; + ~CRECompareLessThan(); + bool GetValue(int frame, float& valOut) const; }; class CRECompareEqual : public CRealElement { @@ -282,8 +282,8 @@ class CRECompareEqual : public CRealElement { public: CRECompareEqual(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d); - ~CRECompareEqual() override; - bool GetValue(int frame, float& valOut) const override; + ~CRECompareEqual(); + bool GetValue(int frame, float& valOut) const; }; class CREConstantRange : public CRealElement { @@ -296,8 +296,8 @@ class CREConstantRange : public CRealElement { public: CREConstantRange(CRealElement* a, CRealElement* b, CRealElement* c, CRealElement* d, CRealElement* e); - ~CREConstantRange() override; - bool GetValue(int frame, float& valOut) const override; + ~CREConstantRange(); + bool GetValue(int frame, float& valOut) const; }; class CREExternalVar : public CRealElement { @@ -305,8 +305,8 @@ class CREExternalVar : public CRealElement { public: CREExternalVar(CIntElement* a); - ~CREExternalVar() override; - bool GetValue(int frame, float& valOut) const override; + ~CREExternalVar(); + bool GetValue(int frame, float& valOut) const; }; class CRESubtract : public CRealElement { @@ -315,8 +315,8 @@ class CRESubtract : public CRealElement { public: CRESubtract(CRealElement* a, CRealElement* b); - ~CRESubtract() override; - bool GetValue(int frame, float& valOut) const override; + ~CRESubtract(); + bool GetValue(int frame, float& valOut) const; }; class CREGetComponentRed : public CRealElement { @@ -324,8 +324,8 @@ class CREGetComponentRed : public CRealElement { public: CREGetComponentRed(CColorElement* a); - ~CREGetComponentRed() override; - bool GetValue(int frame, float& valOut) const override; + ~CREGetComponentRed(); + bool GetValue(int frame, float& valOut) const; }; class CREGetComponentGreen : public CRealElement { @@ -333,8 +333,8 @@ class CREGetComponentGreen : public CRealElement { public: CREGetComponentGreen(CColorElement* a); - ~CREGetComponentGreen() override; - bool GetValue(int frame, float& valOut) const override; + ~CREGetComponentGreen(); + bool GetValue(int frame, float& valOut) const; }; class CREGetComponentBlue : public CRealElement { @@ -342,8 +342,8 @@ class CREGetComponentBlue : public CRealElement { public: CREGetComponentBlue(CColorElement* a); - ~CREGetComponentBlue() override; - bool GetValue(int frame, float& valOut) const override; + ~CREGetComponentBlue(); + bool GetValue(int frame, float& valOut) const; }; class CREGetComponentAlpha : public CRealElement { @@ -351,8 +351,8 @@ class CREGetComponentAlpha : public CRealElement { public: CREGetComponentAlpha(CColorElement* a); - ~CREGetComponentAlpha() override; - bool GetValue(int frame, float& valOut) const override; + ~CREGetComponentAlpha(); + bool GetValue(int frame, float& valOut) const; }; class CREIntTimesReal : public CRealElement { @@ -361,8 +361,8 @@ class CREIntTimesReal : public CRealElement { public: CREIntTimesReal(CIntElement* a, CRealElement* b); - ~CREIntTimesReal() override; - bool GetValue(int frame, float& valOut) const override; + ~CREIntTimesReal(); + bool GetValue(int frame, float& valOut) const; }; #endif // _CREALELEMENT diff --git a/include/Kyoto/Particles/CUVElement.hpp b/include/Kyoto/Particles/CUVElement.hpp index c7ae5384..27459703 100644 --- a/include/Kyoto/Particles/CUVElement.hpp +++ b/include/Kyoto/Particles/CUVElement.hpp @@ -13,11 +13,11 @@ class CUVEConstant : public CUVElement { public: CUVEConstant(TToken< CTexture > tex); - ~CUVEConstant() override; - TLockedToken< CTexture > GetValueTexture(int frame) const override; - void GetValueUV(int frame, SUVElementSet& valOut) const override; - bool HasConstantTexture() const override { return true; } - bool HasConstantUV() const override { return true; } + ~CUVEConstant(); + TLockedToken< CTexture > GetValueTexture(int frame) const; + void GetValueUV(int frame, SUVElementSet& valOut) const; + bool HasConstantTexture() const { return true; } + bool HasConstantUV() const { return true; } }; class CUVEAnimTexture : public CUVElement { @@ -34,11 +34,11 @@ class CUVEAnimTexture : public CUVElement { public: CUVEAnimTexture(TToken< CTexture > tex, CIntElement* tileW, CIntElement* tileH, CIntElement* strideW, CIntElement* strideH, CIntElement* cycleFrames, bool loop); - ~CUVEAnimTexture() override; - TLockedToken< CTexture > GetValueTexture(int frame) const override; - void GetValueUV(int frame, SUVElementSet& valOut) const override; - bool HasConstantTexture() const override { return true; } - bool HasConstantUV() const override { return false; } + ~CUVEAnimTexture(); + TLockedToken< CTexture > GetValueTexture(int frame) const; + void GetValueUV(int frame, SUVElementSet& valOut) const; + bool HasConstantTexture() const { return true; } + bool HasConstantUV() const { return false; } }; #endif // _CUVELEMENT diff --git a/include/Kyoto/Particles/CVectorElement.hpp b/include/Kyoto/Particles/CVectorElement.hpp index 0145bd99..f3d47c5a 100644 --- a/include/Kyoto/Particles/CVectorElement.hpp +++ b/include/Kyoto/Particles/CVectorElement.hpp @@ -11,9 +11,9 @@ class CVEFastConstant : public CVectorElement { public: CVEFastConstant(float x, float y, float z); - ~CVEFastConstant() override; - bool GetValue(int frame, CVector3f& valOut) const override; - bool IsFastConstant() const override { return true; } + ~CVEFastConstant(); + bool GetValue(int frame, CVector3f& valOut) const; + bool IsFastConstant() const { return true; } private: CVector3f x4_val; @@ -21,51 +21,51 @@ private: class CVEParticleLocation : public CVectorElement { public: - ~CVEParticleLocation() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleLocation() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleColor : public CVectorElement { public: - ~CVEParticleColor() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleColor() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleVelocity : public CVectorElement { public: - ~CVEParticleVelocity() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleVelocity() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleSystemOrientationFront : public CVectorElement { public: - ~CVEParticleSystemOrientationFront() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleSystemOrientationFront() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleSystemOrientationUp : public CVectorElement { public: - ~CVEParticleSystemOrientationUp() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleSystemOrientationUp() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleSystemOrientationRight : public CVectorElement { public: - ~CVEParticleSystemOrientationRight() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleSystemOrientationRight() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEParticleSystemTranslation : public CVectorElement { public: - ~CVEParticleSystemTranslation() override {} - bool GetValue(int frame, CVector3f& valOut) const override; + ~CVEParticleSystemTranslation() {} + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEConstant : public CVectorElement { public: CVEConstant(CRealElement* x, CRealElement* y, CRealElement* z); ~CVEConstant(); - bool GetValue(int frame, CVector3f& valOut) const override; + bool GetValue(int frame, CVector3f& valOut) const; public: CRealElement* x4_x; @@ -82,7 +82,7 @@ class CVECone : public CVectorElement { public: CVECone(CVectorElement* direction, CRealElement* magnitude); ~CVECone(); - bool GetValue(int frame, CVector3f& valOut) const override; + bool GetValue(int frame, CVector3f& valOut) const; }; class CVEAngleCone : public CVectorElement { @@ -96,7 +96,7 @@ public: CVEAngleCone(CRealElement* angleXConstant, CRealElement* angleYConstant, CRealElement* angleXRange, CRealElement* angleYRange, CRealElement* magnitude); ~CVEAngleCone(); - bool GetValue(int frame, CVector3f& valOut) const override; + bool GetValue(int frame, CVector3f& valOut) const; }; #endif // _CVECTORELEMENT diff --git a/include/Kyoto/Particles/IElement.hpp b/include/Kyoto/Particles/IElement.hpp index 95ddcfa0..46cb47b1 100644 --- a/include/Kyoto/Particles/IElement.hpp +++ b/include/Kyoto/Particles/IElement.hpp @@ -27,7 +27,7 @@ public: class CIntElement : public IElement { public: - ~CIntElement() override{}; + ~CIntElement() {}; virtual bool GetValue(int frame, int& valOut) const = 0; }; diff --git a/include/Kyoto/Streams/CMemoryInStream.hpp b/include/Kyoto/Streams/CMemoryInStream.hpp index aabdcafb..48ed9caa 100644 --- a/include/Kyoto/Streams/CMemoryInStream.hpp +++ b/include/Kyoto/Streams/CMemoryInStream.hpp @@ -12,8 +12,8 @@ public: CMemoryInStream(const void* ptr, unsigned long len); CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership); - virtual ~CMemoryInStream() override {} - virtual size_t Read(void* dest, size_t len) override; + virtual ~CMemoryInStream() {} + virtual size_t Read(void* dest, size_t len); }; #endif // _CMEMORYINSTREAM diff --git a/include/Kyoto/Streams/CZipInputStream.hpp b/include/Kyoto/Streams/CZipInputStream.hpp index 416abfdb..dd0b7ba4 100644 --- a/include/Kyoto/Streams/CZipInputStream.hpp +++ b/include/Kyoto/Streams/CZipInputStream.hpp @@ -13,8 +13,8 @@ class CZipInputStream : public CInputStream { public: CZipInputStream(rstl::auto_ptr< CInputStream > in); - ~CZipInputStream() override; - size_t Read(void* dest, size_t len) override; + ~CZipInputStream(); + size_t Read(void* dest, size_t len); private: rstl::single_ptr mCompBuf; diff --git a/include/MetaRender/CCubeRenderer.hpp b/include/MetaRender/CCubeRenderer.hpp index 34b9c5f3..468c02fa 100644 --- a/include/MetaRender/CCubeRenderer.hpp +++ b/include/MetaRender/CCubeRenderer.hpp @@ -22,75 +22,75 @@ class CModel; class CCubeRenderer : public IRenderer, public IWeaponRenderer { public: - ~CCubeRenderer() override; + ~CCubeRenderer(); // TODO types - void AddStaticGeometry() override; - void EnablePVS(const CPVSVisSet& set, int areaIdx) override; - void DisablePVS() override; - void RemoveStaticGeometry() override; - void DrawUnsortedGeometry(int areaIdx, int mask, int targetMask) override; - void DrawSortedGeometry(int areaIdx, int mask, int targetMask) override; - void DrawStaticGeometry(int areaIdx, int mask, int targetMask) override; - void DrawAreaGeometry(int areaIdx, int mask, int targetMask) override; - void PostRenderFogs() override; - void SetModelMatrix(const CTransform4f& xf) override; - void AddParticleGen(const CParticleGen& gen) override; - void AddParticleGen2() override; - void AddPlaneObject() override; + void AddStaticGeometry(); + void EnablePVS(const CPVSVisSet& set, int areaIdx); + void DisablePVS(); + void RemoveStaticGeometry(); + void DrawUnsortedGeometry(int areaIdx, int mask, int targetMask); + void DrawSortedGeometry(int areaIdx, int mask, int targetMask); + void DrawStaticGeometry(int areaIdx, int mask, int targetMask); + void DrawAreaGeometry(int areaIdx, int mask, int targetMask); + void PostRenderFogs(); + void SetModelMatrix(const CTransform4f& xf); + void AddParticleGen(const CParticleGen& gen); + void AddParticleGen2(); + void AddPlaneObject(); void AddDrawable(const void* obj, const CVector3f& pos, const CAABox& bounds, int mode, - IRenderer::EDrawableSorting sorting) override; - void SetDrawableCallback(TDrawableCallback cb, void* ctx) override; - void SetWorldViewpoint() override; - void SetPerspective1(float, float, float, float, float) override; - void SetPerspective2() override; + IRenderer::EDrawableSorting sorting); + void SetDrawableCallback(TDrawableCallback cb, void* ctx); + void SetWorldViewpoint(); + void SetPerspective1(float, float, float, float, float); + void SetPerspective2(); rstl::pair< CVector2f, CVector2f > SetViewportOrtho(bool centered, float znear, - float zfar) override; - void SetClippingPlanes(const CFrustumPlanes&) override; - void SetViewport(int left, int right, int width, int height) override; - void SetDepthReadWrite(bool read, bool update) override; - void SetBlendMode_AdditiveAlpha() override; - void SetBlendMode_AlphaBlended() override; - void SetBlendMode_NoColorWrite() override; - void SetBlendMode_ColorMultiply() override; - void SetBlendMode_InvertDst() override; - void SetBlendMode_InvertSrc() override; - void SetBlendMode_Replace() override; - void SetBlendMode_AdditiveDestColor() override; - void SetDebugOption() override; - void BeginScene() override; - void EndScene() override; - void BeginPrimitive(GXPrimitive prim, int count) override; - void BeginLines(int nverts) override; - void BeginLineStrip(int nverts) override; - void BeginTriangles(int nverts) override; - void BeginTriangleStrip(int nverts) override; - void BeginTriangleFan(int nverts) override; - void PrimVertex(const CVector3f& vtx) override; - void PrimNormal(const CVector3f& nrm) override; - void PrimColor(float r, float g, float b, float a) override; - void PrimColor(const CColor& color) override; - void EndPrimitive() override; - void SetAmbientColor(const CColor& color) override; - void DrawString() override; - void GetFPS() override; - void CacheReflection() override; - void DrawSpaceWarp() override; - void DrawThermalModel() override; - void DrawModelDisintegrate() override; - void DrawModelFlat() override; - void SetWireframeFlags() override; - void SetWorldFog() override; + float zfar); + void SetClippingPlanes(const CFrustumPlanes&); + void SetViewport(int left, int right, int width, int height); + void SetDepthReadWrite(bool read, bool update); + void SetBlendMode_AdditiveAlpha(); + void SetBlendMode_AlphaBlended(); + void SetBlendMode_NoColorWrite(); + void SetBlendMode_ColorMultiply(); + void SetBlendMode_InvertDst(); + void SetBlendMode_InvertSrc(); + void SetBlendMode_Replace(); + void SetBlendMode_AdditiveDestColor(); + void SetDebugOption(); + void BeginScene(); + void EndScene(); + void BeginPrimitive(GXPrimitive prim, int count); + void BeginLines(int nverts); + void BeginLineStrip(int nverts); + void BeginTriangles(int nverts); + void BeginTriangleStrip(int nverts); + void BeginTriangleFan(int nverts); + void PrimVertex(const CVector3f& vtx); + void PrimNormal(const CVector3f& nrm); + void PrimColor(float r, float g, float b, float a); + void PrimColor(const CColor& color); + void EndPrimitive(); + void SetAmbientColor(const CColor& color); + void DrawString(); + void GetFPS(); + void CacheReflection(); + void DrawSpaceWarp(); + void DrawThermalModel(); + void DrawModelDisintegrate(); + void DrawModelFlat(); + void SetWireframeFlags(); + void SetWorldFog(); void RenderFogVolume(const CColor&, const CAABox&, const TLockedToken< CModel >*, - const CSkinnedModel*) override; - void SetThermal() override; - void SetThermalColdScale() override; - void DoThermalBlendCold() override; - void DoThermalBlendHot() override; - void GetStaticWorldDataSize() override; - void SetGXRegister1Color() override; - void SetWorldLightFadeLevel() override; - void Something() override; - void PrepareDynamicLights(const rstl::vector& lights) override; + const CSkinnedModel*); + void SetThermal(); + void SetThermalColdScale(); + void DoThermalBlendCold(); + void DoThermalBlendHot(); + void GetStaticWorldDataSize(); + void SetGXRegister1Color(); + void SetWorldLightFadeLevel(); + void Something(); + void PrepareDynamicLights(const rstl::vector& lights); void AllocatePhazonSuitMaskTexture(); diff --git a/include/MetroidPrime/BodyState/CABSAim.hpp b/include/MetroidPrime/BodyState/CABSAim.hpp index d5aa278f..79c0beb8 100644 --- a/include/MetroidPrime/BodyState/CABSAim.hpp +++ b/include/MetroidPrime/BodyState/CABSAim.hpp @@ -6,9 +6,9 @@ class CABSAim : public CAdditiveBodyState { public: CABSAim(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); private: bool x4_needsIdle; diff --git a/include/MetroidPrime/BodyState/CABSFlinch.hpp b/include/MetroidPrime/BodyState/CABSFlinch.hpp index a42f363e..55b9b07f 100644 --- a/include/MetroidPrime/BodyState/CABSFlinch.hpp +++ b/include/MetroidPrime/BodyState/CABSFlinch.hpp @@ -10,9 +10,9 @@ class CABSFlinch : public CAdditiveBodyState { public: CABSFlinch(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); ~CABSFlinch(); }; diff --git a/include/MetroidPrime/BodyState/CABSIdle.hpp b/include/MetroidPrime/BodyState/CABSIdle.hpp index 8054cdc6..fc2f12b0 100644 --- a/include/MetroidPrime/BodyState/CABSIdle.hpp +++ b/include/MetroidPrime/BodyState/CABSIdle.hpp @@ -7,9 +7,9 @@ class CABSIdle : public CAdditiveBodyState { pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc) const; public: - void Start(CBodyController& bc, CStateManager& mgr) override {} - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override {} + void Start(CBodyController& bc, CStateManager& mgr) {} + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc) {} }; #endif // _CABSIDLE diff --git a/include/MetroidPrime/BodyState/CABSReaction.hpp b/include/MetroidPrime/BodyState/CABSReaction.hpp index 877a938e..e4891637 100644 --- a/include/MetroidPrime/BodyState/CABSReaction.hpp +++ b/include/MetroidPrime/BodyState/CABSReaction.hpp @@ -8,9 +8,9 @@ public: CABSReaction(); ~CABSReaction(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); float GetWeight() const { return x4_weight; } bool IsActive() const { return x10_active; } diff --git a/include/MetroidPrime/BodyState/CBSAttack.hpp b/include/MetroidPrime/BodyState/CBSAttack.hpp index fdadd6b0..538033f2 100644 --- a/include/MetroidPrime/BodyState/CBSAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSAttack.hpp @@ -11,10 +11,10 @@ class CBSAttack : public CBodyState { public: CBSAttack(); - bool CanShoot() const override { return false; } - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool CanShoot() const { return false; } + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: pas::EAnimationState x4_nextState; // = pas::kAS_Invalid; diff --git a/include/MetroidPrime/BodyState/CBSCover.hpp b/include/MetroidPrime/BodyState/CBSCover.hpp index 9953d01d..5ccc578f 100644 --- a/include/MetroidPrime/BodyState/CBSCover.hpp +++ b/include/MetroidPrime/BodyState/CBSCover.hpp @@ -6,12 +6,12 @@ class CBSCover : public CBodyState { public: CBSCover(); - bool IsMoving() const override { return true; } - bool ApplyHeadTracking() const override { return false; } - bool CanShoot() const override; - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool IsMoving() const { return true; } + bool ApplyHeadTracking() const { return false; } + bool CanShoot() const; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); pas::ECoverDirection GetCoverDirection() const { return x8_coverDirection; } bool GetNeedsExit() const { return xc_needsExit; } diff --git a/include/MetroidPrime/BodyState/CBSDie.hpp b/include/MetroidPrime/BodyState/CBSDie.hpp index dcf5c03e..b5a61476 100644 --- a/include/MetroidPrime/BodyState/CBSDie.hpp +++ b/include/MetroidPrime/BodyState/CBSDie.hpp @@ -8,11 +8,11 @@ public: CBSDie(); ~CBSDie(); - bool IsDead() const override; - bool IsDying() const override; - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool IsDead() const; + bool IsDying() const; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: float x4_remTime; diff --git a/include/MetroidPrime/BodyState/CBSFall.hpp b/include/MetroidPrime/BodyState/CBSFall.hpp index a664ecd8..cc5037f4 100644 --- a/include/MetroidPrime/BodyState/CBSFall.hpp +++ b/include/MetroidPrime/BodyState/CBSFall.hpp @@ -8,9 +8,9 @@ public: CBSFall(); ~CBSFall(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSGenerate.hpp b/include/MetroidPrime/BodyState/CBSGenerate.hpp index e993cd08..4607f78e 100644 --- a/include/MetroidPrime/BodyState/CBSGenerate.hpp +++ b/include/MetroidPrime/BodyState/CBSGenerate.hpp @@ -8,9 +8,9 @@ public: CBSGenerate(); ~CBSGenerate(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSGetup.hpp b/include/MetroidPrime/BodyState/CBSGetup.hpp index dfb8c460..28f5831b 100644 --- a/include/MetroidPrime/BodyState/CBSGetup.hpp +++ b/include/MetroidPrime/BodyState/CBSGetup.hpp @@ -8,9 +8,9 @@ public: CBSGetup(); ~CBSGetup(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); private: pas::EFallState x4_fallState; diff --git a/include/MetroidPrime/BodyState/CBSGroundHit.hpp b/include/MetroidPrime/BodyState/CBSGroundHit.hpp index d9f44161..4fab2169 100644 --- a/include/MetroidPrime/BodyState/CBSGroundHit.hpp +++ b/include/MetroidPrime/BodyState/CBSGroundHit.hpp @@ -8,9 +8,9 @@ public: CBSGroundHit(); ~CBSGroundHit(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSKnockBack.hpp b/include/MetroidPrime/BodyState/CBSKnockBack.hpp index c4e5f045..5857bfc4 100644 --- a/include/MetroidPrime/BodyState/CBSKnockBack.hpp +++ b/include/MetroidPrime/BodyState/CBSKnockBack.hpp @@ -8,10 +8,10 @@ public: CBSKnockBack(); ~CBSKnockBack(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; - bool IsMoving() const override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); + bool IsMoving() const; private: float x4_curTime; diff --git a/include/MetroidPrime/BodyState/CBSLieOnGround.hpp b/include/MetroidPrime/BodyState/CBSLieOnGround.hpp index 0172205e..2af9b064 100644 --- a/include/MetroidPrime/BodyState/CBSLieOnGround.hpp +++ b/include/MetroidPrime/BodyState/CBSLieOnGround.hpp @@ -10,9 +10,9 @@ public: explicit CBSLieOnGround(const CActor& actor); ~CBSLieOnGround(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); private: uint x4_24_hasGroundHit : 1; diff --git a/include/MetroidPrime/BodyState/CBSLocomotion.hpp b/include/MetroidPrime/BodyState/CBSLocomotion.hpp index b81a73a6..e3c441fb 100644 --- a/include/MetroidPrime/BodyState/CBSLocomotion.hpp +++ b/include/MetroidPrime/BodyState/CBSLocomotion.hpp @@ -14,10 +14,10 @@ protected: public: bool IsMoving() const override = 0; - bool CanShoot() const override { return true; } - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController& bc) override; + bool CanShoot() const { return true; } + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController& bc); virtual bool IsPitchable() const { return false; } virtual float GetLocomotionSpeed(pas::ELocomotionType type, pas::ELocomotionAnim anim) const = 0; virtual float ApplyLocomotionPhysics(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSLoopAttack.hpp b/include/MetroidPrime/BodyState/CBSLoopAttack.hpp index b862a6c0..b28eb070 100644 --- a/include/MetroidPrime/BodyState/CBSLoopAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSLoopAttack.hpp @@ -7,10 +7,10 @@ class CBSLoopAttack : public CBodyState { public: CBSLoopAttack(); - bool CanShoot() const override { return true; } - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool CanShoot() const { return true; } + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); pas::ELoopState GetState() const { return x4_state; } pas::ELoopAttackType GetAttackType() const { return x8_loopAttackType; } diff --git a/include/MetroidPrime/BodyState/CBSLoopReaction.hpp b/include/MetroidPrime/BodyState/CBSLoopReaction.hpp index 20105e65..53d3f96b 100644 --- a/include/MetroidPrime/BodyState/CBSLoopReaction.hpp +++ b/include/MetroidPrime/BodyState/CBSLoopReaction.hpp @@ -7,9 +7,9 @@ class CBSLoopReaction : public CBodyState { public: CBSLoopReaction(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override {} + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&) {} private: pas::ELoopState x4_state; diff --git a/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp b/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp index 6c9d85a4..64fa3867 100644 --- a/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp +++ b/include/MetroidPrime/BodyState/CBSProjectileAttack.hpp @@ -8,10 +8,10 @@ public: CBSProjectileAttack(); ~CBSProjectileAttack(); - bool CanShoot() const override; - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool CanShoot() const; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSScripted.hpp b/include/MetroidPrime/BodyState/CBSScripted.hpp index 1e9d2227..78f51f50 100644 --- a/include/MetroidPrime/BodyState/CBSScripted.hpp +++ b/include/MetroidPrime/BodyState/CBSScripted.hpp @@ -8,10 +8,10 @@ public: CBSScripted(); ~CBSScripted(); - bool ApplyHeadTracking() const override; - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool ApplyHeadTracking() const; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: bool x4_24_loopAnim : 1; diff --git a/include/MetroidPrime/BodyState/CBSSlide.hpp b/include/MetroidPrime/BodyState/CBSSlide.hpp index f5c32a73..73908c9b 100644 --- a/include/MetroidPrime/BodyState/CBSSlide.hpp +++ b/include/MetroidPrime/BodyState/CBSSlide.hpp @@ -10,11 +10,11 @@ public: CBSSlide(); ~CBSSlide(); - bool ApplyHeadTracking() const override; - bool IsMoving() const override; - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool ApplyHeadTracking() const; + bool IsMoving() const; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: float x4_rotateSpeed; diff --git a/include/MetroidPrime/BodyState/CBSStep.hpp b/include/MetroidPrime/BodyState/CBSStep.hpp index 558e26ff..5436a099 100644 --- a/include/MetroidPrime/BodyState/CBSStep.hpp +++ b/include/MetroidPrime/BodyState/CBSStep.hpp @@ -8,11 +8,11 @@ public: CBSStep(); ~CBSStep(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; - bool IsMoving() const override; - bool CanShoot() const override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); + bool IsMoving() const; + bool CanShoot() const; private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSTaunt.hpp b/include/MetroidPrime/BodyState/CBSTaunt.hpp index 5ddef1d2..f046656a 100644 --- a/include/MetroidPrime/BodyState/CBSTaunt.hpp +++ b/include/MetroidPrime/BodyState/CBSTaunt.hpp @@ -8,9 +8,9 @@ public: CBSTaunt(); ~CBSTaunt(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); private: pas::EAnimationState GetBodyStateTransition(float dt, CBodyController& bc); diff --git a/include/MetroidPrime/BodyState/CBSTurn.hpp b/include/MetroidPrime/BodyState/CBSTurn.hpp index 39576570..c2df1e5c 100644 --- a/include/MetroidPrime/BodyState/CBSTurn.hpp +++ b/include/MetroidPrime/BodyState/CBSTurn.hpp @@ -8,12 +8,12 @@ class CBSTurn : public CBodyState { public: CBSTurn(); - ~CBSTurn() override {} + ~CBSTurn() {} - bool CanShoot() const override { return true; } - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; - void Shutdown(CBodyController&) override; + bool CanShoot() const { return true; } + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); + void Shutdown(CBodyController&); protected: float x4_rotateSpeed; @@ -28,8 +28,8 @@ protected: class CBSFlyerTurn : public CBSTurn { public: CBSFlyerTurn(); - void Start(CBodyController& bc, CStateManager& mgr) override; - pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr) override; + void Start(CBodyController& bc, CStateManager& mgr); + pas::EAnimationState UpdateBody(float dt, CBodyController& bc, CStateManager& mgr); }; #endif // _CBSTURN diff --git a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp index c69e4ab3..10fd85c9 100644 --- a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp +++ b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp @@ -156,7 +156,7 @@ public: CBCSlideCmd(pas::ESlideType type, const CVector3f& dir) : CBodyStateCmd(kBSC_Slide), x8_type(type), xc_dir(dir) {} - ~CBCSlideCmd() override {} + ~CBCSlideCmd() {} pas::ESlideType GetSlideType() const { return x8_type; } const CVector3f& GetSlideDirection() const { return xc_dir; } diff --git a/include/MetroidPrime/CActor.hpp b/include/MetroidPrime/CActor.hpp index 0f20bff0..bcd4910e 100644 --- a/include/MetroidPrime/CActor.hpp +++ b/include/MetroidPrime/CActor.hpp @@ -56,10 +56,10 @@ public: CActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf, const CModelData& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId nextDrawNode); - ~CActor() override; + ~CActor(); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void SetActive(uchar active) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void SetActive(const bool active); virtual void PreRender(CStateManager&, const CFrustumPlanes&); virtual void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; diff --git a/include/MetroidPrime/CAnimationDatabaseGame.hpp b/include/MetroidPrime/CAnimationDatabaseGame.hpp index 7c3e5b02..43ec4ab9 100644 --- a/include/MetroidPrime/CAnimationDatabaseGame.hpp +++ b/include/MetroidPrime/CAnimationDatabaseGame.hpp @@ -34,12 +34,12 @@ class CAnimationDatabaseGame : public CAnimationDatabase { public: explicit CAnimationDatabaseGame(const rstl::vector< CAnimation >& anims); - const rstl::rc_ptr< IMetaAnim >& GetMetaAnim(uint idx) const override; - uint GetNumMetaAnims() const override; - rstl::string GetMetaAnimName(uint idx) const override; - void GetAllUniquePrimitives(rstl::vector< CPrimitive >& primsOut) const override; + const rstl::rc_ptr< IMetaAnim >& GetMetaAnim(uint idx) const; + uint GetNumMetaAnims() const; + rstl::string GetMetaAnimName(uint idx) const; + void GetAllUniquePrimitives(rstl::vector< CPrimitive >& primsOut) const; void GetUniquePrimitivesFromMetaAnim(rstl::set< CPrimitive >& primsOut, - const rstl::string& name) const override; + const rstl::string& name) const; private: rstl::vector< rstl::rc_ptr< IMetaAnim > > x10_anims; diff --git a/include/MetroidPrime/CAudioStateWin.hpp b/include/MetroidPrime/CAudioStateWin.hpp index 15163049..ac8c8a3e 100644 --- a/include/MetroidPrime/CAudioStateWin.hpp +++ b/include/MetroidPrime/CAudioStateWin.hpp @@ -9,8 +9,8 @@ class CAudioStateWin : public CIOWin { public: CAudioStateWin(); - ~CAudioStateWin() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + ~CAudioStateWin(); + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); }; #endif // _CAUDIOSTATEWIN diff --git a/include/MetroidPrime/CCollisionActor.hpp b/include/MetroidPrime/CCollisionActor.hpp index c212c14f..5c9a4304 100644 --- a/include/MetroidPrime/CCollisionActor.hpp +++ b/include/MetroidPrime/CCollisionActor.hpp @@ -30,26 +30,26 @@ public: float mass); // CEntity - ~CCollisionActor() override; - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CCollisionActor(); + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - CHealthInfo* HealthInfo(CStateManager&) override; - const CDamageVulnerability* GetDamageVulnerability() const override; + CHealthInfo* HealthInfo(CStateManager&); + const CDamageVulnerability* GetDamageVulnerability() const; const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&, - const CDamageInfo&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; - CVector3f GetOrbitPosition(const CStateManager&) const override; - CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const override; + const CDamageInfo&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); + CVector3f GetOrbitPosition(const CStateManager&) const; + CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const override; - void OnScanStateChange(EScanState, CStateManager&) override; + int /*EProjectileAttrib?*/) const; + void OnScanStateChange(EScanState, CStateManager&); // CPhysicsActor - CTransform4f GetPrimitiveTransform() const override; + CTransform4f GetPrimitiveTransform() const; private: EPrimitiveType x258_primitiveType; diff --git a/include/MetroidPrime/CConsoleOutputWindow.hpp b/include/MetroidPrime/CConsoleOutputWindow.hpp index 6ff090fb..fb92bf89 100644 --- a/include/MetroidPrime/CConsoleOutputWindow.hpp +++ b/include/MetroidPrime/CConsoleOutputWindow.hpp @@ -12,8 +12,8 @@ class CConsoleOutputWindow : public CIOWin { public: CConsoleOutputWindow(int, float, float); - ~CConsoleOutputWindow() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; + ~CConsoleOutputWindow(); + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); void Update(float); void Draw() const; private: diff --git a/include/MetroidPrime/CCredits.hpp b/include/MetroidPrime/CCredits.hpp index 98395284..3c16c97f 100644 --- a/include/MetroidPrime/CCredits.hpp +++ b/include/MetroidPrime/CCredits.hpp @@ -19,11 +19,11 @@ class CVector3f; class CCredits : public CIOWin { public: CCredits(); - ~CCredits() override; + ~CCredits(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; - bool GetIsContinueDraw() const override; - void Draw() const override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + bool GetIsContinueDraw() const; + void Draw() const; EMessageReturn Update(float, CArchitectureQueue& queue); EMessageReturn ProcessUserInput(const CFinalInput& input); diff --git a/include/MetroidPrime/CEffect.hpp b/include/MetroidPrime/CEffect.hpp index 225f1610..4d3f3409 100644 --- a/include/MetroidPrime/CEffect.hpp +++ b/include/MetroidPrime/CEffect.hpp @@ -11,11 +11,11 @@ public: const CTransform4f& xf); // CEntity - ~CEffect() override {} + ~CEffect() {} // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; }; CHECK_SIZEOF(CEffect, 0xe8) diff --git a/include/MetroidPrime/CEntity.hpp b/include/MetroidPrime/CEntity.hpp index 42bca04d..96263649 100644 --- a/include/MetroidPrime/CEntity.hpp +++ b/include/MetroidPrime/CEntity.hpp @@ -18,7 +18,7 @@ public: virtual void PreThink(float dt, CStateManager& mgr); virtual void Think(float dt, CStateManager& mgr); virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); - virtual void SetActive(uchar active); + virtual void SetActive(const bool active); CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name); @@ -32,7 +32,7 @@ public: const rstl::string& GetDebugName() const { return x10_name; } TAreaId GetAreaId() const; TAreaId GetCurrentAreaId() const { return x4_areaId; } - uchar GetActive() const { return x30_24_active; } + const bool GetActive() const { return x30_24_active; } bool IsScriptingBlocked() const { return x30_26_scriptingBlocked; } // might be fake? @@ -47,7 +47,7 @@ private: TEditorId xc_editorId; rstl::string x10_name; rstl::vector< SConnection > x20_conns; - uchar x30_24_active : 1; + bool x30_24_active : 1; bool x30_25_inGraveyard : 1; bool x30_26_scriptingBlocked : 1; bool x30_27_notInArea : 1; diff --git a/include/MetroidPrime/CErrorOutputWindow.hpp b/include/MetroidPrime/CErrorOutputWindow.hpp index 9fb6863e..6a69082c 100644 --- a/include/MetroidPrime/CErrorOutputWindow.hpp +++ b/include/MetroidPrime/CErrorOutputWindow.hpp @@ -8,11 +8,11 @@ class CErrorOutputWindow : public CIOWin { public: CErrorOutputWindow(bool); - ~CErrorOutputWindow() override; + ~CErrorOutputWindow(); - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; - bool GetIsContinueDraw() const override; - void Draw() const override; + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + bool GetIsContinueDraw() const; + void Draw() const; void UpdateWindow(); diff --git a/include/MetroidPrime/CExplosion.hpp b/include/MetroidPrime/CExplosion.hpp index d3eb7bf7..f0f81146 100644 --- a/include/MetroidPrime/CExplosion.hpp +++ b/include/MetroidPrime/CExplosion.hpp @@ -22,16 +22,16 @@ public: const CVector3f& scale, const CColor& color); // CEntity - ~CExplosion() override; - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CExplosion(); + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - void CalculateRenderBounds() override; + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + void CalculateRenderBounds(); public: rstl::single_ptr< CParticleGen > xe8_particleGen; diff --git a/include/MetroidPrime/CFlameWarp.hpp b/include/MetroidPrime/CFlameWarp.hpp index f97f2636..dec8d100 100644 --- a/include/MetroidPrime/CFlameWarp.hpp +++ b/include/MetroidPrime/CFlameWarp.hpp @@ -14,7 +14,7 @@ class CColor; class CFlameWarp : public CWarp { public: CFlameWarp(float maxInfluenceDist, const CVector3f& warpPoint, bool collisionWarp); - ~CFlameWarp() override; + ~CFlameWarp(); const rstl::reserved_vector< CVector3f, 9 >& GetCollisionPoints() const { return x4_collisionPoints; @@ -26,14 +26,14 @@ public: const CVector3f& GetFloatingPoint() const { return x80_floatingPoint; } void SetMaxDistSq(float d) { x8c_maxDistSq = d; } void SetStateManager(CStateManager& mgr) { x9c_stateMgr = &mgr; } - bool UpdateWarp() override; + bool UpdateWarp(); void ModifyParticles(int particleCount, int stripe, int*, CVector3f* particlePos, CVector3f* particlePrevPos, CVector3f* particleVelocity, - CColor* color, float* lineLengthOrSize, float* lineWidthOrRota) override; - void Activate(bool val) override { xa0_24_activated = val; } - bool IsActivated() override; + CColor* color, float* lineLengthOrSize, float* lineWidthOrRota); + void Activate(bool val) { xa0_24_activated = val; } + bool IsActivated(); bool IsProcessed() const { return xa0_26_processed; } - FourCC Get4CharID() override; + FourCC Get4CharID(); void ResetPosition(const CVector3f& pos); CAABox CalculateBounds() const; diff --git a/include/MetroidPrime/CGameArea.hpp b/include/MetroidPrime/CGameArea.hpp index 07f45d5b..889f4659 100644 --- a/include/MetroidPrime/CGameArea.hpp +++ b/include/MetroidPrime/CGameArea.hpp @@ -94,14 +94,14 @@ public: }; ~CGameArea(); - const CTransform4f& IGetTM() const override; - CAssetId IGetStringTableAssetId() const override; - uint IGetNumAttachedAreas() const override; - TAreaId IGetAttachedAreaId(int) const override; - bool IIsActive() const override; - CAssetId IGetAreaAssetId() const override; - int IGetAreaSaveId() const override; - rstl::pair< rstl::auto_ptr< uchar >, int > IGetScriptingMemoryAlways() const override; + const CTransform4f& IGetTM() const; + CAssetId IGetStringTableAssetId() const; + uint IGetNumAttachedAreas() const; + TAreaId IGetAttachedAreaId(int) const; + bool IIsActive() const; + CAssetId IGetAreaAssetId() const; + int IGetAreaSaveId() const; + rstl::pair< rstl::auto_ptr< uchar >, int > IGetScriptingMemoryAlways() const; TAreaId GetId() const { return x4_selfIdx; } const CTransform4f& GetTM() const { return xc_transform; } diff --git a/include/MetroidPrime/CGameLight.hpp b/include/MetroidPrime/CGameLight.hpp index e0444be4..30f34e05 100644 --- a/include/MetroidPrime/CGameLight.hpp +++ b/include/MetroidPrime/CGameLight.hpp @@ -14,8 +14,8 @@ public: void SetLight(const CLight& light); CLight GetLight() const; - void Think(float dt, CStateManager& mgr) override; - void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& mgr); + void Accept(IVisitor& visitor); void SetLightPriorityAndId(); private: diff --git a/include/MetroidPrime/CMainFlow.hpp b/include/MetroidPrime/CMainFlow.hpp index 8d98bd9f..8b3cd330 100644 --- a/include/MetroidPrime/CMainFlow.hpp +++ b/include/MetroidPrime/CMainFlow.hpp @@ -24,10 +24,10 @@ class CMainFlow : public CIOWin { public: CMainFlow(); - ~CMainFlow() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; - bool GetIsContinueDraw() const override; - void Draw() const override; + ~CMainFlow(); + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + bool GetIsContinueDraw() const; + void Draw() const; void AdvanceGameState(CArchitectureQueue& queue); void SetGameState(EClientFlowStates state, CArchitectureQueue& queue); diff --git a/include/MetroidPrime/CParticleGenInfoGeneric.hpp b/include/MetroidPrime/CParticleGenInfoGeneric.hpp index c1d9cb44..80eb6842 100644 --- a/include/MetroidPrime/CParticleGenInfoGeneric.hpp +++ b/include/MetroidPrime/CParticleGenInfoGeneric.hpp @@ -14,23 +14,23 @@ public: EParticleGenType state); ~CParticleGenInfoGeneric(); - virtual void AddToRenderer() override; - virtual void Render() override; - virtual void Update(float dt, CStateManager& stateMgr) override; - virtual void SetOrientation(const CTransform4f& xf, CStateManager& stateMgr) override; - virtual void SetTranslation(const CVector3f& trans, CStateManager& stateMgr) override; - virtual void SetGlobalOrientation(const CTransform4f& xf, CStateManager& stateMgr) override; - virtual void SetGlobalTranslation(const CVector3f& trans, CStateManager& stateMgr) override; - virtual void SetGlobalScale(const CVector3f& scale) override; - virtual void SetParticleEmission(bool isActive, CStateManager& stateMgr) override; - virtual bool IsSystemDeletable() const override; - virtual rstl::optional_object GetBounds() const override; - virtual bool HasActiveParticles() const override; - virtual void DestroyParticles() override; - virtual bool HasLight() const override; - virtual TUniqueId GetLightId() const override; - virtual void DeleteLight(CStateManager& stateMgr) override; - virtual void SetModulationColor(const CColor& color) override; + virtual void AddToRenderer(); + virtual void Render(); + virtual void Update(float dt, CStateManager& stateMgr); + virtual void SetOrientation(const CTransform4f& xf, CStateManager& stateMgr); + virtual void SetTranslation(const CVector3f& trans, CStateManager& stateMgr); + virtual void SetGlobalOrientation(const CTransform4f& xf, CStateManager& stateMgr); + virtual void SetGlobalTranslation(const CVector3f& trans, CStateManager& stateMgr); + virtual void SetGlobalScale(const CVector3f& scale); + virtual void SetParticleEmission(bool isActive, CStateManager& stateMgr); + virtual bool IsSystemDeletable() const; + virtual rstl::optional_object GetBounds() const; + virtual bool HasActiveParticles() const; + virtual void DestroyParticles(); + virtual bool HasLight() const; + virtual TUniqueId GetLightId() const; + virtual void DeleteLight(CStateManager& stateMgr); + virtual void SetModulationColor(const CColor& color); const rstl::rc_ptr< CParticleGen >& GetParticleSystem() const { return x84_system; } diff --git a/include/MetroidPrime/CPhysicsActor.hpp b/include/MetroidPrime/CPhysicsActor.hpp index 9f24fe2e..bbde1e7a 100644 --- a/include/MetroidPrime/CPhysicsActor.hpp +++ b/include/MetroidPrime/CPhysicsActor.hpp @@ -68,10 +68,10 @@ public: float stepUp, float stepDown); // CActor - ~CPhysicsActor() override; - void Render(const CStateManager&) const override; - CVector3f GetOrbitPosition(const CStateManager& mgr) const override; - CVector3f GetAimPosition(const CStateManager& mgr, float val) const override; + ~CPhysicsActor(); + void Render(const CStateManager&) const; + CVector3f GetOrbitPosition(const CStateManager& mgr) const; + CVector3f GetAimPosition(const CStateManager& mgr, float val) const; // CPhysicsActor virtual const CCollisionPrimitive* GetCollisionPrimitive() const; diff --git a/include/MetroidPrime/CSplashScreen.hpp b/include/MetroidPrime/CSplashScreen.hpp index 62f0fbb3..f8f629fb 100644 --- a/include/MetroidPrime/CSplashScreen.hpp +++ b/include/MetroidPrime/CSplashScreen.hpp @@ -15,9 +15,9 @@ public: CSplashScreen(ESplashScreen); - ~CSplashScreen() override; - EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; - void Draw() const override; + ~CSplashScreen(); + EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&); + void Draw() const; }; #endif // _CSPLASHSCREEN diff --git a/include/MetroidPrime/CWorld.hpp b/include/MetroidPrime/CWorld.hpp index 5a9acdf6..949f8035 100644 --- a/include/MetroidPrime/CWorld.hpp +++ b/include/MetroidPrime/CWorld.hpp @@ -64,17 +64,17 @@ enum EEnvFxType { class CWorld : public IWorld { public: ~CWorld(); - CAssetId IGetWorldAssetId() const override; - CAssetId IGetStringTableAssetId() const override; - CAssetId IGetSaveWorldAssetId() const override; - const CMapWorld* IGetMapWorld() const override; - CMapWorld* IMapWorld() override; - const IGameArea* IGetAreaAlways(TAreaId id) const override; - TAreaId IGetCurrentAreaId() const override; - TAreaId IGetAreaId(CAssetId id) const override; - bool ICheckWorldComplete() override; - rstl::string IGetDefaultAudioTrack() const override; - int IGetAreaCount() const override; + CAssetId IGetWorldAssetId() const; + CAssetId IGetStringTableAssetId() const; + CAssetId IGetSaveWorldAssetId() const; + const CMapWorld* IGetMapWorld() const; + CMapWorld* IMapWorld(); + const IGameArea* IGetAreaAlways(TAreaId id) const; + TAreaId IGetCurrentAreaId() const; + TAreaId IGetAreaId(CAssetId id) const; + bool ICheckWorldComplete(); + rstl::string IGetDefaultAudioTrack() const; + int IGetAreaCount() const; void SetLoadPauseState(bool); void TouchSky() const; diff --git a/include/MetroidPrime/Cameras/CBallCamera.hpp b/include/MetroidPrime/Cameras/CBallCamera.hpp index a9f48f4b..5e35e2a3 100644 --- a/include/MetroidPrime/Cameras/CBallCamera.hpp +++ b/include/MetroidPrime/Cameras/CBallCamera.hpp @@ -99,17 +99,17 @@ public: float farZ, float aspect); // CEntity - ~CBallCamera() override; - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CBallCamera(); + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void Render(const CStateManager&) const override; + void Render(const CStateManager&) const; // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr) override; - void Reset(const CTransform4f&, CStateManager& mgr) override; + void ProcessInput(const CFinalInput&, CStateManager& mgr); + void Reset(const CTransform4f&, CStateManager& mgr); // CBallCamera void SetupColliders(rstl::vector< CCameraCollider >& out, float xMag, float zMag, float radius, diff --git a/include/MetroidPrime/Cameras/CCinematicCamera.hpp b/include/MetroidPrime/Cameras/CCinematicCamera.hpp index ae67f13b..16c0bb1a 100644 --- a/include/MetroidPrime/Cameras/CCinematicCamera.hpp +++ b/include/MetroidPrime/Cameras/CCinematicCamera.hpp @@ -12,14 +12,14 @@ public: float zfar, float aspect, uint flags); ~CCinematicCamera(); // CActor - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr) override; - void Reset(const CTransform4f&, CStateManager& mgr) override; + void ProcessInput(const CFinalInput&, CStateManager& mgr); + void Reset(const CTransform4f&, CStateManager& mgr); // CCinematicCamera u32 GetFlags() const { return x21c_flags; } diff --git a/include/MetroidPrime/Cameras/CGameCamera.hpp b/include/MetroidPrime/Cameras/CGameCamera.hpp index b7c9168a..7428bb07 100644 --- a/include/MetroidPrime/Cameras/CGameCamera.hpp +++ b/include/MetroidPrime/Cameras/CGameCamera.hpp @@ -17,10 +17,10 @@ public: TUniqueId watchedId, bool disableInput, int controllerIdx); // CEntity - ~CGameCamera() override; - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void SetActive(uchar active) override; + ~CGameCamera(); + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void SetActive(const bool active); // CGameCamera virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0; diff --git a/include/MetroidPrime/Cameras/CInterpolationCamera.hpp b/include/MetroidPrime/Cameras/CInterpolationCamera.hpp index 9d24353d..be7df89a 100644 --- a/include/MetroidPrime/Cameras/CInterpolationCamera.hpp +++ b/include/MetroidPrime/Cameras/CInterpolationCamera.hpp @@ -7,8 +7,8 @@ class CInterpolationCamera : public CGameCamera { public: CInterpolationCamera(TUniqueId uid, const CTransform4f& xf); // CGameCamera - void ProcessInput(const CFinalInput&, CStateManager& mgr) override; - void Reset(const CTransform4f&, CStateManager& mgr) override; + void ProcessInput(const CFinalInput&, CStateManager& mgr); + void Reset(const CTransform4f&, CStateManager& mgr); private: TUniqueId x188_targetId; float x18c_time; diff --git a/include/MetroidPrime/Enemies/CAi.hpp b/include/MetroidPrime/Enemies/CAi.hpp index 044df876..2294819d 100644 --- a/include/MetroidPrime/Enemies/CAi.hpp +++ b/include/MetroidPrime/Enemies/CAi.hpp @@ -20,13 +20,13 @@ public: // const CStateMachine* GetStateMachine() const; ~CAi(); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - CHealthInfo* HealthInfo(CStateManager&) override; - const CDamageVulnerability* GetDamageVulnerability() const override { return nullptr; } + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + CHealthInfo* HealthInfo(CStateManager&); + const CDamageVulnerability* GetDamageVulnerability() const { return nullptr; } EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int) const override; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; + int) const; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); ; virtual void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) = 0; diff --git a/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp b/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp index 64b1091e..0babea94 100644 --- a/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp +++ b/include/MetroidPrime/Enemies/CFlaahgraPlants.hpp @@ -16,15 +16,15 @@ public: TUniqueId, const CTransform4f&, const CDamageInfo&, const CVector3f&); // CEntity - ~CFlaahgraPlants() override; - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; - void Think(float dt, CStateManager& mgr) override; + ~CFlaahgraPlants(); + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr); + void Think(float dt, CStateManager& mgr); // CActor - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor& actor, CStateManager& mgr) override; + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor& actor, CStateManager& mgr); private: rstl::auto_ptr< CElementGen > xe8_elementGen; diff --git a/include/MetroidPrime/Enemies/CMetaree.hpp b/include/MetroidPrime/Enemies/CMetaree.hpp index 7ac46d41..b1e9ce8e 100644 --- a/include/MetroidPrime/Enemies/CMetaree.hpp +++ b/include/MetroidPrime/Enemies/CMetaree.hpp @@ -17,31 +17,31 @@ public: float f3, float f4, const CActorParameters& aParms); // CEntity - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void Touch(CActor&, CStateManager&) override; + void Touch(CActor&, CStateManager&); // CPhysicsActor void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr) override; + CStateManager& mgr); // CAi - void Dead(CStateManager&, EStateMsg, float) override; - void Halt(CStateManager&, EStateMsg, float) override; - void Attack(CStateManager&, EStateMsg, float) override; - void Active(CStateManager&, EStateMsg, float) override; - void InActive(CStateManager&, EStateMsg, float) override; - void Flee(CStateManager&, EStateMsg, float) override; - void Explode(CStateManager&, EStateMsg, float) override; - bool InRange(CStateManager&, float) override; - bool Delay(CStateManager&, float) override; - bool ShouldAttack(CStateManager&, float) override; + void Dead(CStateManager&, EStateMsg, float); + void Halt(CStateManager&, EStateMsg, float); + void Attack(CStateManager&, EStateMsg, float); + void Active(CStateManager&, EStateMsg, float); + void InActive(CStateManager&, EStateMsg, float); + void Flee(CStateManager&, EStateMsg, float); + void Explode(CStateManager&, EStateMsg, float); + bool InRange(CStateManager&, float); + bool Delay(CStateManager&, float); + bool ShouldAttack(CStateManager&, float); // CPatterned - void ThinkAboutMove(float) override; + void ThinkAboutMove(float); private: float x568_delay; diff --git a/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp b/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp index 2c764454..276cbe57 100644 --- a/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp +++ b/include/MetroidPrime/Enemies/CMetroidPrimeProjectile.hpp @@ -42,12 +42,12 @@ public: bool sendCollideMsg); // CEntity - ~CMetroidPrimeProjectile() override; - void Accept(IVisitor& visitor) override; + ~CMetroidPrimeProjectile(); + void Accept(IVisitor& visitor); // CEnergyProjectile bool Explode(const CVector3f& pos, const CVector3f& normal, EWeaponCollisionResponseTypes type, - CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor) override; + CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor); }; #endif // _CMETROIDPRIMEPROJECTILE diff --git a/include/MetroidPrime/Enemies/CNewIntroBoss.hpp b/include/MetroidPrime/Enemies/CNewIntroBoss.hpp index b39774ef..5fc743bb 100644 --- a/include/MetroidPrime/Enemies/CNewIntroBoss.hpp +++ b/include/MetroidPrime/Enemies/CNewIntroBoss.hpp @@ -19,30 +19,30 @@ public: CAssetId beamTextureId, CAssetId beamGlowTextureId); // CEntity - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void OnScanStateChange(EScanState, CStateManager&) override; - CAABox GetSortingBounds(const CStateManager&) const override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void OnScanStateChange(EScanState, CStateManager&); + CAABox GetSortingBounds(const CStateManager&) const; void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, - float dt) override; + float dt); // CAi - void Patrol(CStateManager&, EStateMsg, float) override; - void Generate(CStateManager& mgr, EStateMsg msg, float arg) override; - void Attack(CStateManager&, EStateMsg, float) override; - bool InAttackPosition(CStateManager&, float) override; - bool AnimOver(CStateManager&, float) override; - bool ShouldAttack(CStateManager&, float) override; - bool ShouldTurn(CStateManager&, float) override; - bool AIStage(CStateManager&, float) override; + void Patrol(CStateManager&, EStateMsg, float); + void Generate(CStateManager& mgr, EStateMsg msg, float arg); + void Attack(CStateManager&, EStateMsg, float); + bool InAttackPosition(CStateManager&, float); + bool AnimOver(CStateManager&, float); + bool ShouldAttack(CStateManager&, float); + bool ShouldTurn(CStateManager&, float); + bool AIStage(CStateManager&, float); // CPatterned - CProjectileInfo* ProjectileInfo() override; + CProjectileInfo* ProjectileInfo(); pas::ELocomotionType GetLocoForHealth(const CStateManager& mgr) const; pas::EGenerateType GetGenerateForHealth(const CStateManager& mgr) const; diff --git a/include/MetroidPrime/Enemies/CPatterned.hpp b/include/MetroidPrime/Enemies/CPatterned.hpp index ab406a6f..b75d4b06 100644 --- a/include/MetroidPrime/Enemies/CPatterned.hpp +++ b/include/MetroidPrime/Enemies/CPatterned.hpp @@ -151,73 +151,73 @@ public: EBodyType body, const CActorParameters& params, EKnockBackVariant kbVariant); // CEntity - ~CPatterned() override; - void Accept(IVisitor& visitor) override; - void PreThink(float dt, CStateManager& mgr) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + ~CPatterned(); + void Accept(IVisitor& visitor); + void PreThink(float dt, CStateManager& mgr); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); // CActor - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - bool CanRenderUnsorted(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; - CVector3f GetOrbitPosition(const CStateManager&) const override; - CVector3f GetAimPosition(const CStateManager&, float) const override; + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + bool CanRenderUnsorted(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); + CVector3f GetOrbitPosition(const CStateManager&) const; + CVector3f GetAimPosition(const CStateManager&, float) const; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const override; + int /*EProjectileAttrib?*/) const; void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, - float dt) override; + float dt); // CPhysicsActor void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr) override; + CStateManager& mgr); // CAi - void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state) override; + void Death(CStateManager& mgr, const CVector3f& direction, EScriptObjectState state); void KnockBack(const CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, - bool inDeferred, float magnitude) override; - void TakeDamage(const CVector3f& direction, float magnitude) override; - void Patrol(CStateManager&, EStateMsg, float) override; - void FollowPattern(CStateManager&, EStateMsg, float) override; - void Dead(CStateManager&, EStateMsg, float) override; - void PathFind(CStateManager&, EStateMsg, float) override; - void Start(CStateManager&, EStateMsg, float) override; - void TargetPatrol(CStateManager&, EStateMsg, float) override; - void TargetPlayer(CStateManager&, EStateMsg, float) override; - bool Leash(CStateManager&, float) override; - bool OffLine(CStateManager&, float) override; - bool Attacked(CStateManager&, float) override; - bool PathShagged(CStateManager&, float) override; - bool PathOver(CStateManager&, float) override; - bool PathFound(CStateManager&, float) override; - bool TooClose(CStateManager&, float) override; - bool InRange(CStateManager&, float) override; - bool InMaxRange(CStateManager&, float) override; - bool InDetectionRange(CStateManager&, float) override; - bool SpotPlayer(CStateManager&, float) override; - bool PlayerSpot(CStateManager&, float) override; - bool PatternOver(CStateManager&, float) override; - bool PatternShagged(CStateManager&, float) override; - bool HasAttackPattern(CStateManager&, float) override; - bool HasPatrolPath(CStateManager&, float) override; - bool HasRetreatPattern(CStateManager&, float) override; - bool Delay(CStateManager&, float) override; - bool RandomDelay(CStateManager&, float) override; - bool FixedDelay(CStateManager&, float) override; - bool Default(CStateManager&, float) override; - bool AnimOver(CStateManager&, float) override; - bool InPosition(CStateManager&, float) override; - bool Stuck(CStateManager&, float) override; - bool NoPathNodes(CStateManager&, float) override; - bool Landed(CStateManager&, float) override; - bool PatrolPathOver(CStateManager&, float) override; - bool CodeTrigger(CStateManager&, float) override; - bool Random(CStateManager&, float) override; - bool FixedRandom(CStateManager&, float) override; + bool inDeferred, float magnitude); + void TakeDamage(const CVector3f& direction, float magnitude); + void Patrol(CStateManager&, EStateMsg, float); + void FollowPattern(CStateManager&, EStateMsg, float); + void Dead(CStateManager&, EStateMsg, float); + void PathFind(CStateManager&, EStateMsg, float); + void Start(CStateManager&, EStateMsg, float); + void TargetPatrol(CStateManager&, EStateMsg, float); + void TargetPlayer(CStateManager&, EStateMsg, float); + bool Leash(CStateManager&, float); + bool OffLine(CStateManager&, float); + bool Attacked(CStateManager&, float); + bool PathShagged(CStateManager&, float); + bool PathOver(CStateManager&, float); + bool PathFound(CStateManager&, float); + bool TooClose(CStateManager&, float); + bool InRange(CStateManager&, float); + bool InMaxRange(CStateManager&, float); + bool InDetectionRange(CStateManager&, float); + bool SpotPlayer(CStateManager&, float); + bool PlayerSpot(CStateManager&, float); + bool PatternOver(CStateManager&, float); + bool PatternShagged(CStateManager&, float); + bool HasAttackPattern(CStateManager&, float); + bool HasPatrolPath(CStateManager&, float); + bool HasRetreatPattern(CStateManager&, float); + bool Delay(CStateManager&, float); + bool RandomDelay(CStateManager&, float); + bool FixedDelay(CStateManager&, float); + bool Default(CStateManager&, float); + bool AnimOver(CStateManager&, float); + bool InPosition(CStateManager&, float); + bool Stuck(CStateManager&, float); + bool NoPathNodes(CStateManager&, float); + bool Landed(CStateManager&, float); + bool PatrolPathOver(CStateManager&, float); + bool CodeTrigger(CStateManager&, float); + bool Random(CStateManager&, float); + bool FixedRandom(CStateManager&, float); // CPatterned virtual void Freeze(CStateManager& mgr, const CVector3f& pos, const CUnitVector3f& dir, diff --git a/include/MetroidPrime/Enemies/CPuffer.hpp b/include/MetroidPrime/Enemies/CPuffer.hpp index d8c1585a..af6a88ee 100644 --- a/include/MetroidPrime/Enemies/CPuffer.hpp +++ b/include/MetroidPrime/Enemies/CPuffer.hpp @@ -17,13 +17,13 @@ public: const CDamageInfo& cloudDamage, CAssetId cloudSteam, float f2, bool b1, bool b2, bool b3, const CDamageInfo& explosionDamage, ushort sfxId); - ~CPuffer() override; - void Accept(IVisitor&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; - void Death(CStateManager&, const CVector3f&, EScriptObjectState) override; + ~CPuffer(); + void Accept(IVisitor&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); + void Death(CStateManager&, const CVector3f&, EScriptObjectState); private: CVector3f x568_face; diff --git a/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp b/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp index 8f05e978..64b2bf28 100644 --- a/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp +++ b/include/MetroidPrime/Enemies/CRipperControlledPlatform.hpp @@ -11,7 +11,7 @@ public: const CAABox&, bool, const rstl::optional_object< TLockedToken< CCollidableOBBTreeGroupContainer > >&); ~CRipperControlledPlatform(); - CQuaternion Move(float, CStateManager&) override; + CQuaternion Move(float, CStateManager&); private: TUniqueId x358_owner; diff --git a/include/MetroidPrime/GameObjectLists.hpp b/include/MetroidPrime/GameObjectLists.hpp index 2bf17aba..10e9db9a 100644 --- a/include/MetroidPrime/GameObjectLists.hpp +++ b/include/MetroidPrime/GameObjectLists.hpp @@ -6,37 +6,37 @@ class CActorList : public CObjectList { public: CActorList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; class CPhysicsActorList : public CObjectList { public: CPhysicsActorList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; class CGameCameraList : public CObjectList { public: CGameCameraList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; class CListeningAiList : public CObjectList { public: CListeningAiList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; class CAiWaypointList : public CObjectList { public: CAiWaypointList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; class CPlatformAndDoorList : public CObjectList { public: CPlatformAndDoorList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); static uchar IsPlatform(const CEntity* ent); static uchar IsDoor(const CEntity*); }; @@ -44,7 +44,7 @@ public: class CGameLightList : public CObjectList { public: CGameLightList(); - uchar IsQualified(const CEntity& ent) override; + uchar IsQualified(const CEntity& ent); }; diff --git a/include/MetroidPrime/Player/CPlayer.hpp b/include/MetroidPrime/Player/CPlayer.hpp index 0966a3df..bdad9e84 100644 --- a/include/MetroidPrime/Player/CPlayer.hpp +++ b/include/MetroidPrime/Player/CPlayer.hpp @@ -143,36 +143,36 @@ public: }; // CEntity - ~CPlayer() override; - void Accept(IVisitor& visitor) override; - void PreThink(float dt, CStateManager& mgr) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CPlayer(); + void Accept(IVisitor& visitor); + void PreThink(float dt, CStateManager& mgr); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - bool CanRenderUnsorted(const CStateManager&) const override; - void CalculateRenderBounds() override; - CHealthInfo* HealthInfo(CStateManager&) override; - const CDamageVulnerability* GetDamageVulnerability() const override; + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + bool CanRenderUnsorted(const CStateManager&) const; + void CalculateRenderBounds(); + CHealthInfo* HealthInfo(CStateManager&); + const CDamageVulnerability* GetDamageVulnerability() const; const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&, - const CDamageInfo&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; - CVector3f GetAimPosition(const CStateManager&, float) const override; - CVector3f GetHomingPosition(const CStateManager&, float) const override; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; + const CDamageInfo&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); + CVector3f GetAimPosition(const CStateManager&, float) const; + CVector3f GetHomingPosition(const CStateManager&, float) const; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); // CPhysicsActor - const CCollisionPrimitive* GetCollisionPrimitive() const override; - CTransform4f GetPrimitiveTransform() const override; + const CCollisionPrimitive* GetCollisionPrimitive() const; + CTransform4f GetPrimitiveTransform() const; void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list, - CStateManager& mgr) override; - float GetStepDownHeight() const override; - float GetStepUpHeight() const override; - float GetWeight() const override; + CStateManager& mgr); + float GetStepDownHeight() const; + float GetStepUpHeight() const; + float GetWeight() const; // CPlayer virtual bool IsTransparent(); diff --git a/include/MetroidPrime/ScriptObjects/CFire.hpp b/include/MetroidPrime/ScriptObjects/CFire.hpp index f33d511c..d63ac7bf 100644 --- a/include/MetroidPrime/ScriptObjects/CFire.hpp +++ b/include/MetroidPrime/ScriptObjects/CFire.hpp @@ -18,15 +18,15 @@ public: float f2, float f3, float f4); // CEntity - ~CFire() override; - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CFire(); + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void Render(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Render(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); private: rstl::single_ptr< CElementGen > xe8_; diff --git a/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp b/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp index a7c52b63..af8347cf 100644 --- a/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp +++ b/include/MetroidPrime/ScriptObjects/CHUDBillboardEffect.hpp @@ -14,13 +14,13 @@ public: TUniqueId uid, bool active, const rstl::string& name, float dist, const CVector3f& scale0, const CColor& color, const CVector3f& scale1, const CVector3f& translation); - ~CHUDBillboardEffect() override; + ~CHUDBillboardEffect(); - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum) override; - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; - void Render(const CStateManager& mgr) const override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum); + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; + void Render(const CStateManager& mgr) const; bool IsElementGen() const { return x104_26_isElementGen; } void SetRunIndefinitely(bool b) { x104_27_runIndefinitely = b; } CParticleGen* GetParticleGen() const { return xe8_generator.get(); } diff --git a/include/MetroidPrime/ScriptObjects/CRepulsor.hpp b/include/MetroidPrime/ScriptObjects/CRepulsor.hpp index bcb8d478..501756f4 100644 --- a/include/MetroidPrime/ScriptObjects/CRepulsor.hpp +++ b/include/MetroidPrime/ScriptObjects/CRepulsor.hpp @@ -9,8 +9,8 @@ class CRepulsor : public CActor { public: CRepulsor(TUniqueId, bool, const rstl::string&, const CEntityInfo&, const CVector3f&, float); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); float GetAffectRadius() const { return xe8_affectRadius; } }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptActor.hpp b/include/MetroidPrime/ScriptObjects/CScriptActor.hpp index 82229e98..2ca8f3f4 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActor.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActor.hpp @@ -19,23 +19,23 @@ public: bool scaleAdvancementDelta, bool materialFlag54); // CEntity - ~CScriptActor() override; - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CScriptActor(); + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void PreRender(CStateManager&, const CFrustumPlanes&) override; - CHealthInfo* HealthInfo(CStateManager&) override; - const CDamageVulnerability* GetDamageVulnerability() const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void PreRender(CStateManager&, const CFrustumPlanes&); + CHealthInfo* HealthInfo(CStateManager&); + const CDamageVulnerability* GetDamageVulnerability() const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); // CPhysicsActor EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int) const override; - CAABox GetSortingBounds(const CStateManager&) const override; + int) const; + CAABox GetSortingBounds(const CStateManager&) const; bool IsPlayerActor() const { return x2e3_24_isPlayerActor; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp index efc013f2..b292413a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp @@ -10,9 +10,9 @@ public: bool looping, float lifetime, bool isPassive, int fadeOut, bool active, float totalPlayback); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Think(float, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Think(float, CStateManager&); void UpdateEntity(TUniqueId, CStateManager&); bool IsPassive() const { return x44_25_isPassive; } void SetIsPassive(bool b) { x44_25_isPassive = b; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp b/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp index 11570e41..787d6061 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp @@ -14,9 +14,9 @@ public: bool, bool, bool); ~CScriptActorRotate(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager&); private: CVector3f x34_rotation; diff --git a/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp index 4c370b92..8c93d0fb 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.hpp @@ -18,12 +18,12 @@ public: float); ~CScriptAiJumpPoint(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; bool GetInUse(TUniqueId uid) const; TUniqueId GetJumpPoint() const { return x10c_currentWaypoint; } TUniqueId GetJumpTarget() const { return x10e_nextWaypoint; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp b/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp index 03da36ee..254eb2f3 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp @@ -20,8 +20,8 @@ public: float thermalHeat, float xrayFogDistance, float worldLightingLevel, CAssetId skybox, EPhazonType phazonType); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Accept(IVisitor& visitor); ~CScriptAreaAttributes(); bool GetNeedsSky() const { return x34_24_showSkybox; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp index 9714889b..b9fe0f71 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptBallTrigger.hpp @@ -9,11 +9,11 @@ public: const CVector3f&, bool, float, float, float, const CVector3f&, bool); ~CScriptBallTrigger(); - void Accept(IVisitor&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager& mgr) override; - void InhabitantAdded(CActor&, CStateManager&) override; - void InhabitantExited(CActor&, CStateManager&) override; + void Accept(IVisitor&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager& mgr); + void InhabitantAdded(CActor&, CStateManager&); + void InhabitantExited(CActor&, CStateManager&); private: float x150_force; diff --git a/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp b/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp index 4a53b317..9f27d502 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptBeam.hpp @@ -18,9 +18,9 @@ public: const TToken< CWeaponDescription >&, const CBeamInfo&, const CDamageInfo&); ~CScriptBeam(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); }; #endif // _CSCRIPTBEAM diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp index f3fa52e9..8826d178 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.hpp @@ -18,8 +18,8 @@ public: float timeOut, bool active); ~CScriptCameraBlurKeyframe(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); }; #endif // _CSCRIPTCAMERABLURKEYFRAME diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp index 616401e8..d91ed884 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.hpp @@ -26,8 +26,8 @@ public: float timeOut, CAssetId txtr, bool active); ~CScriptCameraFilterKeyframe(); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Accept(IVisitor& visitor); }; #endif // _CSCRIPTCAMERAFILTERKEYFRAME diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp index eade3c9a..e053447d 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.hpp @@ -19,10 +19,10 @@ public: bool deactivateOnEnter, bool deactivateOnExit); ~CScriptCameraHintTrigger(); - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void Touch(CActor& other, CStateManager& mgr) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void Touch(CActor& other, CStateManager& mgr); + rstl::optional_object< CAABox > GetTouchBounds() const; }; #endif // _CSCRIPTCAMERAHINTTRIGGER diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp index 503bd31c..bba4f49b 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.hpp @@ -13,10 +13,10 @@ public: const CRelAngle&, float); ~CScriptCameraPitchVolume(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); // float GetUpPitch() const { return x124_upPitch; } // float GetDownPitch() const { return x128_downPitch; } // const CVector3f& GetScale() const { return x12c_scale; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp index a3412fdf..0e09f4f6 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp @@ -13,8 +13,8 @@ public: const CCameraShakeData& shakeData); ~CScriptCameraShaker(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); }; #endif // _CSCRIPTCAMERASHAKER diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp index adcd02b1..252e5a7f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp @@ -12,10 +12,10 @@ public: const CTransform4f& xf, bool active, float hfov, uint); ~CScriptCameraWaypoint(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; TUniqueId GetRandomNextWaypointId(const CStateManager& mgr) const; float GetHFov() const { return xe8_hfov; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp b/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp index a7cb8cbe..053a4c20 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptControllerAction.hpp @@ -84,8 +84,8 @@ public: CScriptControllerAction(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, bool active, ECommands command, bool b1, uint w1, bool b2); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); static ControlMapper::ECommands GetCommand(ECommands cmd); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp b/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp index 006c7a0b..207cb41f 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCounter.hpp @@ -13,8 +13,8 @@ public: CScriptCounter(TUniqueId, const rstl::string& name, const CEntityInfo& info, int, int, bool, bool); ~CScriptCounter(); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Accept(IVisitor& visitor); }; #endif // _CSCRIPTCOUNTER diff --git a/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp index 5869fdeb..1cd33ec2 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptCoverPoint.hpp @@ -11,12 +11,12 @@ public: const CTransform4f& xf, bool active, uint flags, bool crouch, float horizontalAngle, float verticalAngle, float coverTime); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; bool ShouldCrouch() const; bool ShouldStay() const; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp index 0d4882a6..ce71800d 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.hpp @@ -24,18 +24,18 @@ public: CAssetId colorTex, ECanOrbit canOrbit, bool active, const CVisorParameters& vParams); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const override; - void Render(const CStateManager& mgr) const override; - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; - void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum) override; - const CDamageVulnerability* GetDamageVulnerability() const override { return &x174_dVuln; } - CHealthInfo* HealthInfo(CStateManager&) override { return &x16c_hInfo; } - void Think(float, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; + int /*EProjectileAttrib?*/) const; + void Render(const CStateManager& mgr) const; + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; + void PreRender(CStateManager& mgr, const CFrustumPlanes& frustum); + const CDamageVulnerability* GetDamageVulnerability() const { return &x174_dVuln; } + CHealthInfo* HealthInfo(CStateManager&) { return &x16c_hInfo; } + void Think(float, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; private: CFrustumPlanes xe8_frustum; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp index dfb9c48f..d1d500af 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp @@ -9,9 +9,9 @@ class CScriptDebugCameraWaypoint : public CActor { public: CScriptDebugCameraWaypoint(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf, uint value); - ~CScriptDebugCameraWaypoint() override; + ~CScriptDebugCameraWaypoint(); - void Accept(IVisitor& visitor) override; + void Accept(IVisitor& visitor); private: uint xe8_value; diff --git a/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp b/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp index b0ec93d8..95d62ae7 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDistanceFog.hpp @@ -25,8 +25,8 @@ public: float); ~CScriptDistanceFog(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); }; #endif // _CSCRIPTDISTANCEFOG diff --git a/include/MetroidPrime/ScriptObjects/CScriptDock.hpp b/include/MetroidPrime/ScriptObjects/CScriptDock.hpp index 95849aa7..63f2cf6c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDock.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDock.hpp @@ -11,11 +11,11 @@ public: void SetDockReference(CStateManager& mgr, int); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); void CleanUp() {} CPlane GetPlane(const CStateManager&) const; TAreaId GetAreaId() const { return x260_area; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp b/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp index 4ecbea76..2fab00a8 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptDockAreaChange.hpp @@ -9,8 +9,8 @@ class CScriptDockAreaChange : public CEntity { public: CScriptDockAreaChange(TUniqueId, const rstl::string&, const CEntityInfo&, int, bool); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Accept(IVisitor& visitor); ~CScriptDockAreaChange(); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp b/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp index 1cf17733..eedb8e9a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptEMPulse.hpp @@ -11,13 +11,13 @@ public: CScriptEMPulse(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&, bool, float, float, float, float, float, float, float, CAssetId); - void Accept(IVisitor&) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void CalculateRenderBounds() override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Accept(IVisitor&); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void CalculateRenderBounds(); + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); private: float xe8_duration; diff --git a/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp b/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp index b5c179d9..2e703be5 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptGenerator.hpp @@ -10,8 +10,8 @@ public: bool active, float minScale, float maxScale); ~CScriptGenerator(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); private: int x34_spawnCount; diff --git a/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp b/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp index f4efb12a..9f105659 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptHUDMemo.hpp @@ -26,8 +26,8 @@ public: CScriptHUDMemo::EDisplayType, CAssetId, bool); ~CScriptHUDMemo(); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Accept(IVisitor& visitor); }; CHECK_SIZEOF(CScriptHUDMemo, 0x54) diff --git a/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp b/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp index 53484e93..ee2e1dc5 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp @@ -78,11 +78,11 @@ public: const CTransform4f& xf, bool active, int col, int row, int side, const CVector3f& actorPos, const CVector3f& triggerPos, const CVector3f& effectPos); - ~CScriptMazeNode() override; + ~CScriptMazeNode(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void Think(float dt, CStateManager& mgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void Think(float dt, CStateManager& mgr); static void LoadMazeSeeds(); diff --git a/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp b/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp index 58770074..5e9ecf4c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptMidi.hpp @@ -9,12 +9,12 @@ class CScriptMidi : public CEntity { public: CScriptMidi(TUniqueId id, const CEntityInfo& info, const rstl::string& name, bool active, CAssetId csng, float, float, int); - ~CScriptMidi() override; + ~CScriptMidi(); void Stop(CStateManager& mgr, float fadeTime); void Play(CStateManager& mgr, float fadeTime); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); private: TToken< CMidiManager::CMidiData > x34_song; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp index 795cb16f..161f5aa8 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp @@ -31,12 +31,12 @@ public: float startDelay, bool active); ~CScriptPickup(); - void Think(float, CStateManager&) override; - void Touch(CActor&, CStateManager&) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void Render(const CStateManager&) const override; - void Accept(IVisitor& visitor) override; + void Think(float, CStateManager&); + void Touch(CActor&, CStateManager&); + rstl::optional_object< CAABox > GetTouchBounds() const; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); + void Render(const CStateManager&) const; + void Accept(IVisitor& visitor); float GetPossibility() const; CPlayerState::EItemType GetItem() const; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp b/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp index 0946b758..e59ddaa6 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPickupGenerator.hpp @@ -9,9 +9,9 @@ public: float, bool); ~CScriptPickupGenerator(); - void Accept(IVisitor& visitor) override; + void Accept(IVisitor& visitor); void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, - CStateManager& stateMgr) override; + CStateManager& stateMgr); private: CVector3f x34_position; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp index 8228fc80..fa7079b0 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp @@ -44,25 +44,25 @@ public: bool rainSplashes, uint maxRainSplashes, uint rainGenRate); // CEntity - ~CScriptPlatform() override; - void Accept(IVisitor& visitor) override; - void PreThink(float dt, CStateManager& mgr) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CScriptPlatform(); + void Accept(IVisitor& visitor); + void PreThink(float dt, CStateManager& mgr); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void Render(const CStateManager&) const override; - CHealthInfo* HealthInfo(CStateManager&) override; - const CDamageVulnerability* GetDamageVulnerability() const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - CVector3f GetOrbitPosition(const CStateManager&) const override; - CVector3f GetAimPosition(const CStateManager&, float) const override; - CAABox GetSortingBounds(const CStateManager&) const override; + void PreRender(CStateManager&, const CFrustumPlanes&); + void Render(const CStateManager&) const; + CHealthInfo* HealthInfo(CStateManager&); + const CDamageVulnerability* GetDamageVulnerability() const; + rstl::optional_object< CAABox > GetTouchBounds() const; + CVector3f GetOrbitPosition(const CStateManager&) const; + CVector3f GetAimPosition(const CStateManager&, float) const; + CAABox GetSortingBounds(const CStateManager&) const; // CPhysicsActor - const CCollisionPrimitive* GetCollisionPrimitive() const override; - CTransform4f GetPrimitiveTransform() const override; + const CCollisionPrimitive* GetCollisionPrimitive() const; + CTransform4f GetPrimitiveTransform() const; // CScriptPlatform virtual void SplashThink(const CAABox&, const CFluidPlane&, float, CStateManager&) const; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp index b845b83f..37aaf7f7 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlayerHint.hpp @@ -9,8 +9,8 @@ public: const CTransform4f& xf, bool active, int priority, int overrideFlags); ~CScriptPlayerHint(); - void Accept(IVisitor& visit) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visit); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); int GetPriority() const { return x100_priority; } int GetOverrideFlags() const { return x104_overrideFlags; } TUniqueId GetActorId() const { return x108_mpId; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp index f1393ee2..8864f0c0 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.hpp @@ -18,8 +18,8 @@ private: public: CScriptPlayerStateChange(TUniqueId, const rstl::string&, const CEntityInfo&, bool, int, int, int, EControl, EControlCommandOption); - void Accept(IVisitor& visit) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visit); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); ~CScriptPlayerStateChange(); bool Filtered() { return x44_ctrlCmdOpt == kCCO_Filtered; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp b/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp index 979791ff..78d16ab0 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPointOfInterest.hpp @@ -14,13 +14,13 @@ public: const CScannableParameters&, float); ~CScriptPointOfInterest(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - void CalculateRenderBounds() override; - rstl::optional_object GetTouchBounds() const override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + void CalculateRenderBounds(); + rstl::optional_object GetTouchBounds() const; }; #endif // _CSCRIPTPOINTOFINTEREST diff --git a/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp b/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp index 96d130cd..d3e80ec0 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptProjectedShadow.hpp @@ -12,11 +12,11 @@ public: CScriptShadowProjector(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&, bool, const CVector3f&, bool, float, float, float, float, int); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; void CreateProjectedShadow(); uchar GetPersistent() const { return x110_24_persistent; } diff --git a/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp b/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp index b5e98a7c..0b01e73a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRandomRelay.hpp @@ -9,8 +9,8 @@ public: int sendSetSize, int sendSetVariance, bool percentSize, bool active); ~CScriptRandomRelay(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); void SendLocalScriptMsgs(EScriptObjectState state, CStateManager& stateMgr); private: diff --git a/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp b/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp index 1ae3f78c..357401b6 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRelay.hpp @@ -11,9 +11,9 @@ public: CScriptRelay(TUniqueId, const rstl::string&, const CEntityInfo&, bool); void UpdateObjectRef(CStateManager& stateMgr); - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Think(float, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Think(float, CStateManager& stateMgr); + void Accept(IVisitor& visitor); ~CScriptRelay(); }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp b/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp index fefdf8bb..21e886bb 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRipple.hpp @@ -13,9 +13,9 @@ public: CScriptRipple(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&, bool, float); ~CScriptRipple(); - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager&) override; - void Accept(IVisitor&) override; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager&); + void Accept(IVisitor&); }; #endif // _CSCRIPTRIPPLE diff --git a/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp b/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp index 6fa5e01f..5ebecdef 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.hpp @@ -79,9 +79,9 @@ public: int feedbackS, int outputL, int outputR, int outputS); virtual ~CScriptRoomAcoustics(); - void Think(float dt, CStateManager& stateMgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void Accept(IVisitor& visitor) override; + void Think(float dt, CStateManager& stateMgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void Accept(IVisitor& visitor); void EnableAuxCallbacks(); static void DisableAuxCallbacks(); diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp index a665e242..451d2bbd 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpawnPoint.hpp @@ -19,9 +19,9 @@ public: const rstl::reserved_vector< int, int(CPlayerState::kIT_Max) >& itemCounts, bool, bool, bool); - ~CScriptSpawnPoint() override; - void Accept(IVisitor&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + ~CScriptSpawnPoint(); + void Accept(IVisitor&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); const CTransform4f& GetTransform() const; int GetPowerup(const CPlayerState::EItemType&) const; diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp index 979109f1..6a9f25b5 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp @@ -123,13 +123,13 @@ public: const CVector3f&, const CColor&, bool, const CDamageInfo&, int, int, CPlayerState::EItemType, ushort, ushort, ushort); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override { return x1c8_touchBounds; } + void Accept(IVisitor& visitor); + void Think(float, CStateManager&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const { return x1c8_touchBounds; } void SkipCinematic(CStateManager&); void RingScramble(CStateManager&); diff --git a/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp b/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp index c0bc7a81..eeaa2cca 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.hpp @@ -13,11 +13,11 @@ public: const CVector3f& scale, bool active); ~CScriptSpiderBallAttractionSurface(); - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor& actor, CStateManager& mgr) override; + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr); + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor& actor, CStateManager& mgr); const CVector3f& GetScale() const { return xe8_scale; } }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp b/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp index 4024b32a..133a4328 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptStreamedAudio.hpp @@ -12,8 +12,8 @@ public: void Stop(CStateManager& mgr); void Play(CStateManager& mgr); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); private: rstl::string x34_fileName; diff --git a/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp index 5b01e8fe..22ad3d54 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptTargetingPoint.hpp @@ -15,14 +15,14 @@ public: bool); ~CScriptTargetingPoint(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); bool GetLocked() const; - void Think(float, CStateManager&) override; + void Think(float, CStateManager&); - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; }; diff --git a/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp b/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp index f6896d72..d74ed405 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp @@ -60,15 +60,15 @@ public: uint triggerFlags, bool active, bool deactivateOnEntered, bool deactivateOnExited); ~CScriptTrigger(); - void Touch(CActor&, CStateManager&) override; + void Touch(CActor&, CStateManager&); CAABox GetTriggerBoundsWR() const; - rstl::optional_object GetTouchBounds() const override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager&) override; + rstl::optional_object GetTouchBounds() const; + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager&); void UpdateInhabitants(float, CStateManager&); const rstl::list& GetInhabitants() const; const CScriptTrigger::CObjectTracker* FindObject(TUniqueId); - void Accept(IVisitor& visitor) override; + void Accept(IVisitor& visitor); virtual void InhabitantAdded(CActor&, CStateManager&); virtual void InhabitantIdle(CActor&, CStateManager&); virtual void InhabitantExited(CActor&, CStateManager&); diff --git a/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp b/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp index 20266552..6bda3d1a 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptVisorFlare.hpp @@ -15,12 +15,12 @@ public: const rstl::vector& flares); ~CScriptVisorFlare(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager& stateMgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void PreRender(CStateManager&, const CFrustumPlanes&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager& stateMgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void PreRender(CStateManager&, const CFrustumPlanes&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; }; #endif // _CSCRIPTVISORFLARE diff --git a/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp b/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp index 3dc36354..18ffb946 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptVisorGoo.hpp @@ -14,13 +14,13 @@ public: bool forceShow, bool active); ~CScriptVisorGoo(); - void Accept(IVisitor& visitor) override; - void Think(float, CStateManager& stateMgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Accept(IVisitor& visitor); + void Think(float, CStateManager& stateMgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void Touch(CActor&, CStateManager&); private: TToken< CGenDescription > xe8_particleDesc; diff --git a/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp b/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp index 82f654dd..22870c28 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp @@ -13,13 +13,13 @@ public: int behaviourOrient, int behaviourModifiers, uint animation); // CEntity - ~CScriptWaypoint() override; - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CScriptWaypoint(); + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; // CScriptWaypoint TUniqueId NextWaypoint(const CStateManager& mgr) const; diff --git a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp index 485e7bbf..764fd44c 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp @@ -23,8 +23,8 @@ public: bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay); ~CScriptWorldTeleporter(); - void Accept(IVisitor&) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + void Accept(IVisitor&); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); void StartTransition(CStateManager&); bool GetFadeWhite() const { return x40_27_fadeWhite; } diff --git a/include/MetroidPrime/TCastTo.hpp b/include/MetroidPrime/TCastTo.hpp index fb8a85c1..c0a956f6 100644 --- a/include/MetroidPrime/TCastTo.hpp +++ b/include/MetroidPrime/TCastTo.hpp @@ -84,7 +84,7 @@ public: TCastToPtr(CEntity& p); operator T*() const { return ptr; } -#define VISIT(cls) void Visit(cls& p) override; +#define VISIT(cls) void Visit(cls& p); TCASTTO_VISITORS #undef VISIT diff --git a/include/MetroidPrime/Tweaks/CTweakBall.hpp b/include/MetroidPrime/Tweaks/CTweakBall.hpp index a6dfb92e..58d8abdf 100644 --- a/include/MetroidPrime/Tweaks/CTweakBall.hpp +++ b/include/MetroidPrime/Tweaks/CTweakBall.hpp @@ -14,7 +14,7 @@ class CTweakBall; class CTweakBall : public ITweakObject, public TOneStatic< CTweakBall > { public: - ~CTweakBall() override; + ~CTweakBall(); CTweakBall(CInputStream&); float GetMaxBallTranslationAcceleration(int s) const { return x4_maxTranslationAcceleration[s]; } diff --git a/include/MetroidPrime/Tweaks/CTweakGame.hpp b/include/MetroidPrime/Tweaks/CTweakGame.hpp index 60286d4b..a769042b 100644 --- a/include/MetroidPrime/Tweaks/CTweakGame.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGame.hpp @@ -14,7 +14,7 @@ class CTweakGame; class CTweakGame : public ITweakObject, public TOneStatic< CTweakGame > { public: CTweakGame(CInputStream&); - ~CTweakGame() override; + ~CTweakGame(); const rstl::string& GetWorldPrefix() { return x4_worldPrefix; } const rstl::string& GetDefaultRoom() const { return x14_defaultRoom; } diff --git a/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp b/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp index 48774da6..653410a8 100644 --- a/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGuiColors.hpp @@ -13,7 +13,7 @@ class CTweakGuiColors; class CTweakGuiColors : public ITweakObject, public TOneStatic< CTweakGuiColors > { public: - ~CTweakGuiColors() override; + ~CTweakGuiColors(); CTweakGuiColors(CInputStream& in); const CColor& GetPauseBlurFilterColor() const { return x4_pauseBlurFilterColor; } diff --git a/include/MetroidPrime/Tweaks/CTweakGunRes.hpp b/include/MetroidPrime/Tweaks/CTweakGunRes.hpp index 45ba6eee..2219deb0 100644 --- a/include/MetroidPrime/Tweaks/CTweakGunRes.hpp +++ b/include/MetroidPrime/Tweaks/CTweakGunRes.hpp @@ -21,7 +21,7 @@ public: ResId* d; }; - ~CTweakGunRes() override; + ~CTweakGunRes(); ResId x4_gunMotion; ResId x8_grappleArm; diff --git a/include/MetroidPrime/Tweaks/CTweakPlayer.hpp b/include/MetroidPrime/Tweaks/CTweakPlayer.hpp index 6a5c2237..7fe3971a 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayer.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayer.hpp @@ -15,7 +15,7 @@ class CTweakPlayer; class CTweakPlayer : public ITweakObject, public TOneStatic< CTweakPlayer > { public: CTweakPlayer(CInputStream&); - ~CTweakPlayer() override; + ~CTweakPlayer(); // TODO CPlayer::ESurfaceRestraints float GetMaxTranslationalAcceleration(int s) const { return x4_maxTranslationalAcceleration[s]; } diff --git a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp index 8fde91fb..5ceda3e5 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp @@ -15,7 +15,7 @@ class CTweakPlayerControl; class CTweakPlayerControl : public ITweakObject { public: CTweakPlayerControl(CInputStream&); - ~CTweakPlayerControl() override; + ~CTweakPlayerControl(); ControlMapper::EFunctionList GetMapping(ControlMapper::ECommands command) const; diff --git a/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp b/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp index 203d1043..ea071a89 100644 --- a/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp +++ b/include/MetroidPrime/Tweaks/CTweakPlayerGun.hpp @@ -65,7 +65,7 @@ struct SWeaponInfo { class CTweakPlayerGun : public ITweakObject { public: - ~CTweakPlayerGun() override; + ~CTweakPlayerGun(); float GetUpLookAngle() const { return x4_upLookAngle; } float GetDownLookAngle() const { return x8_downLookAngle; } diff --git a/include/MetroidPrime/Weapons/CBeamProjectile.hpp b/include/MetroidPrime/Weapons/CBeamProjectile.hpp index 23374a6a..e4654020 100644 --- a/include/MetroidPrime/Weapons/CBeamProjectile.hpp +++ b/include/MetroidPrime/Weapons/CBeamProjectile.hpp @@ -21,13 +21,13 @@ public: EProjectileAttrib attribs, bool growingBeam); // CEntity - ~CBeamProjectile() override; - void Accept(IVisitor& visitor) override; + ~CBeamProjectile(); + void Accept(IVisitor& visitor); // CActor - rstl::optional_object GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; - void CalculateRenderBounds() override; + rstl::optional_object GetTouchBounds() const; + void Touch(CActor&, CStateManager&); + void CalculateRenderBounds(); // CBeamProjectile virtual void UpdateFx(const CTransform4f&, float, CStateManager&); diff --git a/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp b/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp index 42bf954e..7106a25a 100644 --- a/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp +++ b/include/MetroidPrime/Weapons/CElectricBeamProjectile.hpp @@ -23,17 +23,17 @@ public: const CDamageInfo&, TUniqueId, TAreaId, TUniqueId, EProjectileAttrib); // CEntity - void Accept(IVisitor&) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; + void Accept(IVisitor&); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Touch(CActor&, CStateManager&) override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Touch(CActor&, CStateManager&); // CBeamProjectile - void UpdateFx(const CTransform4f&, float, CStateManager&) override; - void ResetBeam(CStateManager&, bool) override; - void Fire(const CTransform4f&, CStateManager&, bool) override; + void UpdateFx(const CTransform4f&, float, CStateManager&); + void ResetBeam(CStateManager&, bool); + void Fire(const CTransform4f&, CStateManager&, bool); private: rstl::single_ptr< CParticleElectric > x468_electric; diff --git a/include/MetroidPrime/Weapons/CEnergyProjectile.hpp b/include/MetroidPrime/Weapons/CEnergyProjectile.hpp index aa77efed..7822066f 100644 --- a/include/MetroidPrime/Weapons/CEnergyProjectile.hpp +++ b/include/MetroidPrime/Weapons/CEnergyProjectile.hpp @@ -19,19 +19,19 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CEnergyProjectile() override; - void Accept(IVisitor& visitor) override; - void Think(float dt, CStateManager& mgr) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CEnergyProjectile(); + void Accept(IVisitor& visitor); + void Think(float dt, CStateManager& mgr); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - void Touch(CActor&, CStateManager&) override; + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + void Touch(CActor&, CStateManager&); // CGameProjectile void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, - CStateManager& mgr) override; + CStateManager& mgr); // CEnergyProjectile virtual bool Explode(const CVector3f& pos, const CVector3f& normal, diff --git a/include/MetroidPrime/Weapons/CGameProjectile.hpp b/include/MetroidPrime/Weapons/CGameProjectile.hpp index 180e1e42..97992b62 100644 --- a/include/MetroidPrime/Weapons/CGameProjectile.hpp +++ b/include/MetroidPrime/Weapons/CGameProjectile.hpp @@ -26,14 +26,14 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CGameProjectile() override; - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; + ~CGameProjectile(); + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); // CActor - void Render(const CStateManager&) const override; - rstl::optional_object< CAABox > GetTouchBounds() const override; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; + void Render(const CStateManager&) const; + rstl::optional_object< CAABox > GetTouchBounds() const; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); // CGameProjectile virtual void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, diff --git a/include/MetroidPrime/Weapons/CIceBeam.hpp b/include/MetroidPrime/Weapons/CIceBeam.hpp index bf747f6a..1c10667f 100644 --- a/include/MetroidPrime/Weapons/CIceBeam.hpp +++ b/include/MetroidPrime/Weapons/CIceBeam.hpp @@ -9,24 +9,24 @@ class CIceBeam : public CGunWeapon { public: CIceBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CIceBeam() override; + ~CIceBeam(); // CGunWeapon - void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf) override; - void Update(float dt, CStateManager& mgr) override; + const CTransform4f& xf); + void Update(float dt, CStateManager& mgr); void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2) override; + float chargeFactor2); - void Load(CStateManager& mgr, bool subtypeBasePose) override; - void Unload(CStateManager& mgr) override; - bool IsLoaded() const override; + void Load(CStateManager& mgr, bool subtypeBasePose); + void Unload(CStateManager& mgr); + bool IsLoaded() const; - void EnableFx(bool enable) override; - void EnableSecondaryFx(ESecondaryFxType type) override; + void EnableFx(bool enable); + void EnableSecondaryFx(ESecondaryFxType type); private: TCachedToken< CGenDescription > x21c_iceSmoke; diff --git a/include/MetroidPrime/Weapons/CPlasmaBeam.hpp b/include/MetroidPrime/Weapons/CPlasmaBeam.hpp index 282faa57..6793234d 100644 --- a/include/MetroidPrime/Weapons/CPlasmaBeam.hpp +++ b/include/MetroidPrime/Weapons/CPlasmaBeam.hpp @@ -11,21 +11,21 @@ public: CPlasmaBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CPlasmaBeam() override; + ~CPlasmaBeam(); // CGunWeapon - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf) override; - void Update(float dt, CStateManager& mgr) override; + const CTransform4f& xf); + void Update(float dt, CStateManager& mgr); void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2) override; + float chargeFactor2); - void Load(CStateManager& mgr, bool subtypeBasePose) override; - void Unload(CStateManager& mgr) override; - bool IsLoaded() const override; - void EnableSecondaryFx(ESecondaryFxType type) override; + void Load(CStateManager& mgr, bool subtypeBasePose); + void Unload(CStateManager& mgr); + bool IsLoaded() const; + void EnableSecondaryFx(ESecondaryFxType type); bool IsFiring(const CStateManager& mgr) const; void StopBeam(CStateManager& mgr, bool b1); diff --git a/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp b/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp index 1e33347d..acc23987 100644 --- a/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp +++ b/include/MetroidPrime/Weapons/CPlasmaProjectile.hpp @@ -35,15 +35,15 @@ public: TUniqueId owner, const PlayerEffectResources& res, bool growingBeam, EProjectileAttrib attribs); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; - void ResetBeam(CStateManager& mgr, bool fullReset) override; - void UpdateFx(const CTransform4f& xf, float dt, CStateManager& mgr) override; - void Fire(const CTransform4f& xf, CStateManager& mgr, bool b) override; - void Touch(CActor& other, CStateManager& mgr) override; - bool CanRenderUnsorted(const CStateManager& mgr) const override; - void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override; - void Render(const CStateManager& mgr) const override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr); + void ResetBeam(CStateManager& mgr, bool fullReset); + void UpdateFx(const CTransform4f& xf, float dt, CStateManager& mgr); + void Fire(const CTransform4f& xf, CStateManager& mgr, bool b); + void Touch(CActor& other, CStateManager& mgr); + bool CanRenderUnsorted(const CStateManager& mgr) const; + void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const; + void Render(const CStateManager& mgr) const; CColor GetInnerColor() const { return x490_innerColor; } CColor GetOuterColor() const { return x494_outerColor; } bool IsFiring() const { return x548_26_firing; } diff --git a/include/MetroidPrime/Weapons/CPowerBeam.hpp b/include/MetroidPrime/Weapons/CPowerBeam.hpp index b8a0843d..5fca3e39 100644 --- a/include/MetroidPrime/Weapons/CPowerBeam.hpp +++ b/include/MetroidPrime/Weapons/CPowerBeam.hpp @@ -13,16 +13,16 @@ public: EMaterialTypes playerMaterial, const CVector3f& scale); ~CPowerBeam(); - void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; - void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, const CTransform4f& xf) override; + void PreRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); + void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, const CTransform4f& xf); void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, - TUniqueId homingTarget, float chargeFactor1, float chargeFactor2) override; - void EnableSecondaryFx(ESecondaryFxType type) override; - void Update(float dt, CStateManager& mgr) override; - void Load(CStateManager& mgr, bool subtypeBasePose) override; - void Unload(CStateManager& mgr) override; - bool IsLoaded() const override; + TUniqueId homingTarget, float chargeFactor1, float chargeFactor2); + void EnableSecondaryFx(ESecondaryFxType type); + void Update(float dt, CStateManager& mgr); + void Load(CStateManager& mgr, bool subtypeBasePose); + void Unload(CStateManager& mgr); + bool IsLoaded() const; private: enum ESmokeState { kSS_Inactive, kSS_Active, kSS_Done }; diff --git a/include/MetroidPrime/Weapons/CPowerBomb.hpp b/include/MetroidPrime/Weapons/CPowerBomb.hpp index bbe05394..033e7553 100644 --- a/include/MetroidPrime/Weapons/CPowerBomb.hpp +++ b/include/MetroidPrime/Weapons/CPowerBomb.hpp @@ -14,13 +14,13 @@ public: TUniqueId playerId, const CTransform4f& xf, const CDamageInfo& dInfo); ~CPowerBomb(); - void Accept(IVisitor& visitor) override; - void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; - void Think(float, CStateManager&) override; - void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override; - void Render(const CStateManager&) const override; - rstl::optional_object GetTouchBounds() const override; - void Touch(CActor&, CStateManager&) override; + void Accept(IVisitor& visitor); + void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&); + void Think(float, CStateManager&); + void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; + void Render(const CStateManager&) const; + rstl::optional_object GetTouchBounds() const; + void Touch(CActor&, CStateManager&); float GetCurTime() const { return x15c_curTime; } void ApplyDynamicDamage(const CVector3f&, CStateManager&); diff --git a/include/MetroidPrime/Weapons/CTargetableProjectile.hpp b/include/MetroidPrime/Weapons/CTargetableProjectile.hpp index 010fe5e1..8e1bb4c0 100644 --- a/include/MetroidPrime/Weapons/CTargetableProjectile.hpp +++ b/include/MetroidPrime/Weapons/CTargetableProjectile.hpp @@ -15,19 +15,19 @@ public: ushort visorSfx, bool sendCollideMsg); // CEntity - ~CTargetableProjectile() override; - void Accept(IVisitor&) override; + ~CTargetableProjectile(); + void Accept(IVisitor&); // CACtor - CVector3f GetAimPosition(const CStateManager&, float) const override; + CVector3f GetAimPosition(const CStateManager&, float) const; // CGameProjectile void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, - CStateManager& mgr) override; + CStateManager& mgr); // CEnergyProjectile bool Explode(const CVector3f& pos, const CVector3f& normal, EWeaponCollisionResponseTypes type, - CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor) override; + CStateManager& mgr, const CDamageVulnerability& dVuln, TUniqueId hitActor); private: TToken< CWeaponDescription > x3d8_weaponDesc; diff --git a/include/MetroidPrime/Weapons/CWaveBeam.hpp b/include/MetroidPrime/Weapons/CWaveBeam.hpp index ad391114..139640da 100644 --- a/include/MetroidPrime/Weapons/CWaveBeam.hpp +++ b/include/MetroidPrime/Weapons/CWaveBeam.hpp @@ -14,19 +14,19 @@ class CWaveBeam : public CGunWeapon { public: CWaveBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const CVector3f& scale); - ~CWaveBeam() override; + ~CWaveBeam(); - void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf) override; + void PostRenderGunFx(const CStateManager& mgr, const CTransform4f& xf); void UpdateGunFx(bool shotSmoke, float dt, const CStateManager& mgr, - const CTransform4f& xf) override; + const CTransform4f& xf); void Fire(bool underwater, float dt, CPlayerState::EChargeStage chargeState, const CTransform4f& xf, CStateManager& mgr, TUniqueId homingTarget, float chargeFactor1, - float chargeFactor2) override; - void EnableSecondaryFx(ESecondaryFxType type) override; - void Update(float dt, CStateManager& mgr) override; - void Load(CStateManager& mgr, bool subtypeBasePose) override; - void Unload(CStateManager& mgr) override; - bool IsLoaded() const override; + float chargeFactor2); + void EnableSecondaryFx(ESecondaryFxType type); + void Update(float dt, CStateManager& mgr); + void Load(CStateManager& mgr, bool subtypeBasePose); + void Unload(CStateManager& mgr); + bool IsLoaded() const; private: TCachedToken< CWeaponDescription > x21c_waveBeam; diff --git a/include/MetroidPrime/Weapons/CWeapon.hpp b/include/MetroidPrime/Weapons/CWeapon.hpp index 4281de7d..5f7e97db 100644 --- a/include/MetroidPrime/Weapons/CWeapon.hpp +++ b/include/MetroidPrime/Weapons/CWeapon.hpp @@ -15,15 +15,15 @@ public: const CModelData& mData); // CEntity - ~CWeapon() override; - void Think(float dt, CStateManager& mgr) override; + ~CWeapon(); + void Think(float dt, CStateManager& mgr); // CActor - void Render(const CStateManager&) const override; + void Render(const CStateManager&) const; EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&, const CWeaponMode&, - int /*EProjectileAttrib?*/) const override; - void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override; + int /*EProjectileAttrib?*/) const; + void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); void SetDamageFalloffSpeed(float d); diff --git a/include/WorldFormat/CCollidableOBBTreeGroup.hpp b/include/WorldFormat/CCollidableOBBTreeGroup.hpp index e55931b5..38553f92 100644 --- a/include/WorldFormat/CCollidableOBBTreeGroup.hpp +++ b/include/WorldFormat/CCollidableOBBTreeGroup.hpp @@ -26,12 +26,12 @@ public: CCollidableOBBTreeGroup(CCollidableOBBTreeGroupContainer* container, const CMaterialList& matList); - uint GetTableIndex() const override; - CAABox CalculateAABox(const CTransform4f&) const override; - CAABox CalculateLocalAABox() const override; - FourCC GetPrimType() const override; - ~CCollidableOBBTreeGroup() override {} - CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const override; + uint GetTableIndex() const; + CAABox CalculateAABox(const CTransform4f&) const; + CAABox CalculateLocalAABox() const; + FourCC GetPrimType() const; + ~CCollidableOBBTreeGroup() {} + CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const; private: CCollidableOBBTreeGroupContainer* x10_container; diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 7180dc04..39bf311c 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -68,13 +68,6 @@ typedef int BOOL; #ifndef nullptr #define nullptr NULL #endif - -#if defined(__MWERKS__) -#ifndef override -#define override -#endif -#endif - #endif #ifndef ATTRIBUTE_ALIGN diff --git a/src/Kyoto/zlib/contrib/delphi2/zlib.pas b/src/Kyoto/zlib/contrib/delphi2/zlib.pas index 10ae4cae..29202468 100644 --- a/src/Kyoto/zlib/contrib/delphi2/zlib.pas +++ b/src/Kyoto/zlib/contrib/delphi2/zlib.pas @@ -87,10 +87,10 @@ type function GetCompressionRate: Single; public constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream); - destructor Destroy; override; - function Read(var Buffer; Count: Longint): Longint; override; - function Write(const Buffer; Count: Longint): Longint; override; - function Seek(Offset: Longint; Origin: Word): Longint; override; + destructor Destroy;; + function Read(var Buffer; Count: Longint): Longint;; + function Write(const Buffer; Count: Longint): Longint;; + function Seek(Offset: Longint; Origin: Word): Longint;; property CompressionRate: Single read GetCompressionRate; property OnProgress; end; @@ -116,10 +116,10 @@ type TDecompressionStream = class(TCustomZlibStream) public constructor Create(Source: TStream); - destructor Destroy; override; - function Read(var Buffer; Count: Longint): Longint; override; - function Write(const Buffer; Count: Longint): Longint; override; - function Seek(Offset: Longint; Origin: Word): Longint; override; + destructor Destroy;; + function Read(var Buffer; Count: Longint): Longint;; + function Write(const Buffer; Count: Longint): Longint;; + function Seek(Offset: Longint; Origin: Word): Longint;; property OnProgress; end; diff --git a/src/MetroidPrime/CEntity.cpp b/src/MetroidPrime/CEntity.cpp index 4d0a63d3..e1900303 100644 --- a/src/MetroidPrime/CEntity.cpp +++ b/src/MetroidPrime/CEntity.cpp @@ -56,6 +56,6 @@ void CEntity::PreThink(float dt, CStateManager& mgr) {} void CEntity::Think(float dt, CStateManager& mgr) {} -void CEntity::SetActive(uchar active) { x30_24_active = active; } +void CEntity::SetActive(const bool active) { x30_24_active = active; } TAreaId CEntity::GetAreaId() const { return x30_27_notInArea ? kInvalidAreaId : x4_areaId; } diff --git a/src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp b/src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp index 06430fff..c4ca5897 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp @@ -33,9 +33,9 @@ void CScriptSpawnPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objI switch (msg) { case kSM_Reset: for (int i = 0; i < CPlayerState::kIT_Max; ++i) { - CPlayerState::EItemType e = CPlayerState::EItemType(i); - stateMgr.PlayerState()->ReInitializePowerUp(CPlayerState::EItemType(i), GetPowerup(e)); - stateMgr.PlayerState()->ResetAndIncrPickUp(CPlayerState::EItemType(i), GetPowerup(e)); + const CPlayerState::EItemType e = CPlayerState::EItemType(i); + stateMgr.PlayerState()->ReInitializePowerUp(e, GetPowerup(e)); + stateMgr.PlayerState()->ResetAndIncrPickUp(e, GetPowerup(e)); } case kSM_SetToZero: diff --git a/src/MetroidPrime/TCastTo.cpp b/src/MetroidPrime/TCastTo.cpp index 9dab4577..0044adb8 100644 --- a/src/MetroidPrime/TCastTo.cpp +++ b/src/MetroidPrime/TCastTo.cpp @@ -9,8 +9,8 @@ #define STUB(cls, parent) \ class cls : public parent { \ public: \ - ~cls() override; \ - void Accept(IVisitor& visitor) override; \ + ~cls(); \ + void Accept(IVisitor& visitor); \ }; STUB(CWeapon, CActor) STUB(CBomb, CWeapon)