diff --git a/Makefile b/Makefile index 5d6e7821..8529a700 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ include e_files.mk endif O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \ - $(KYOTO_CWD) $(RODATA_O_FILES) $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) \ + $(METROIDPRIME) $(WORLDFORMAT) $(WEAPONS) $(METARENDER) $(GUISYS) $(COLLISION) \ + $(KYOTO) $(RODATA_O_FILES) $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) \ $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(AI_FILES) \ $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \ $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \ diff --git a/asm/Kyoto_CWD/BodyState/CABSAim.s b/asm/MetroidPrime/BodyState/CABSAim.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CABSAim.s rename to asm/MetroidPrime/BodyState/CABSAim.s diff --git a/asm/Kyoto_CWD/BodyState/CABSFlinch.s b/asm/MetroidPrime/BodyState/CABSFlinch.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CABSFlinch.s rename to asm/MetroidPrime/BodyState/CABSFlinch.s diff --git a/asm/Kyoto_CWD/BodyState/CABSIdle.s b/asm/MetroidPrime/BodyState/CABSIdle.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CABSIdle.s rename to asm/MetroidPrime/BodyState/CABSIdle.s diff --git a/asm/Kyoto_CWD/BodyState/CABSReaction.s b/asm/MetroidPrime/BodyState/CABSReaction.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CABSReaction.s rename to asm/MetroidPrime/BodyState/CABSReaction.s diff --git a/asm/Kyoto_CWD/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSAttack.s rename to asm/MetroidPrime/BodyState/CBSAttack.s diff --git a/asm/Kyoto_CWD/BodyState/CBSCover.s b/asm/MetroidPrime/BodyState/CBSCover.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSCover.s rename to asm/MetroidPrime/BodyState/CBSCover.s diff --git a/asm/Kyoto_CWD/BodyState/CBSDie.s b/asm/MetroidPrime/BodyState/CBSDie.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSDie.s rename to asm/MetroidPrime/BodyState/CBSDie.s diff --git a/asm/Kyoto_CWD/BodyState/CBSFall.s b/asm/MetroidPrime/BodyState/CBSFall.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSFall.s rename to asm/MetroidPrime/BodyState/CBSFall.s diff --git a/asm/Kyoto_CWD/BodyState/CBSGenerate.s b/asm/MetroidPrime/BodyState/CBSGenerate.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSGenerate.s rename to asm/MetroidPrime/BodyState/CBSGenerate.s diff --git a/asm/Kyoto_CWD/BodyState/CBSGetup.s b/asm/MetroidPrime/BodyState/CBSGetup.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSGetup.s rename to asm/MetroidPrime/BodyState/CBSGetup.s diff --git a/asm/Kyoto_CWD/BodyState/CBSGroundHit.s b/asm/MetroidPrime/BodyState/CBSGroundHit.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSGroundHit.s rename to asm/MetroidPrime/BodyState/CBSGroundHit.s diff --git a/asm/Kyoto_CWD/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSHurled.s rename to asm/MetroidPrime/BodyState/CBSHurled.s diff --git a/asm/Kyoto_CWD/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSJump.s rename to asm/MetroidPrime/BodyState/CBSJump.s diff --git a/asm/Kyoto_CWD/BodyState/CBSKnockBack.s b/asm/MetroidPrime/BodyState/CBSKnockBack.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSKnockBack.s rename to asm/MetroidPrime/BodyState/CBSKnockBack.s diff --git a/asm/Kyoto_CWD/BodyState/CBSLieOnGround.s b/asm/MetroidPrime/BodyState/CBSLieOnGround.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSLieOnGround.s rename to asm/MetroidPrime/BodyState/CBSLieOnGround.s diff --git a/asm/Kyoto_CWD/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSLocomotion.s rename to asm/MetroidPrime/BodyState/CBSLocomotion.s diff --git a/asm/Kyoto_CWD/BodyState/CBSLoopAttack.s b/asm/MetroidPrime/BodyState/CBSLoopAttack.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSLoopAttack.s rename to asm/MetroidPrime/BodyState/CBSLoopAttack.s diff --git a/asm/Kyoto_CWD/BodyState/CBSLoopReaction.s b/asm/MetroidPrime/BodyState/CBSLoopReaction.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSLoopReaction.s rename to asm/MetroidPrime/BodyState/CBSLoopReaction.s diff --git a/asm/Kyoto_CWD/BodyState/CBSProjectileAttack.s b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSProjectileAttack.s rename to asm/MetroidPrime/BodyState/CBSProjectileAttack.s diff --git a/asm/Kyoto_CWD/BodyState/CBSScripted.s b/asm/MetroidPrime/BodyState/CBSScripted.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSScripted.s rename to asm/MetroidPrime/BodyState/CBSScripted.s diff --git a/asm/Kyoto_CWD/BodyState/CBSSlide.s b/asm/MetroidPrime/BodyState/CBSSlide.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSSlide.s rename to asm/MetroidPrime/BodyState/CBSSlide.s diff --git a/asm/Kyoto_CWD/BodyState/CBSStep.s b/asm/MetroidPrime/BodyState/CBSStep.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSStep.s rename to asm/MetroidPrime/BodyState/CBSStep.s diff --git a/asm/Kyoto_CWD/BodyState/CBSTaunt.s b/asm/MetroidPrime/BodyState/CBSTaunt.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSTaunt.s rename to asm/MetroidPrime/BodyState/CBSTaunt.s diff --git a/asm/Kyoto_CWD/BodyState/CBSTurn.s b/asm/MetroidPrime/BodyState/CBSTurn.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSTurn.s rename to asm/MetroidPrime/BodyState/CBSTurn.s diff --git a/asm/Kyoto_CWD/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBSWallHang.s rename to asm/MetroidPrime/BodyState/CBSWallHang.s diff --git a/asm/Kyoto_CWD/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBodyController.s rename to asm/MetroidPrime/BodyState/CBodyController.s diff --git a/asm/Kyoto_CWD/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBodyStateCmdMgr.s rename to asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s diff --git a/asm/Kyoto_CWD/BodyState/CBodyStateInfo.s b/asm/MetroidPrime/BodyState/CBodyStateInfo.s similarity index 100% rename from asm/Kyoto_CWD/BodyState/CBodyStateInfo.s rename to asm/MetroidPrime/BodyState/CBodyStateInfo.s diff --git a/asm/Kyoto_CWD/CAABoxFilter.s b/asm/MetroidPrime/CAABoxFilter.s similarity index 100% rename from asm/Kyoto_CWD/CAABoxFilter.s rename to asm/MetroidPrime/CAABoxFilter.s diff --git a/asm/Kyoto_CWD/CActor.s b/asm/MetroidPrime/CActor.s similarity index 100% rename from asm/Kyoto_CWD/CActor.s rename to asm/MetroidPrime/CActor.s diff --git a/asm/Kyoto_CWD/CActorLights.s b/asm/MetroidPrime/CActorLights.s similarity index 100% rename from asm/Kyoto_CWD/CActorLights.s rename to asm/MetroidPrime/CActorLights.s diff --git a/asm/Kyoto_CWD/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s similarity index 100% rename from asm/Kyoto_CWD/CActorParameters.s rename to asm/MetroidPrime/CActorParameters.s diff --git a/asm/Kyoto_CWD/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s similarity index 100% rename from asm/Kyoto_CWD/CActorParticles.s rename to asm/MetroidPrime/CActorParticles.s diff --git a/asm/Kyoto_CWD/CAnimData.s b/asm/MetroidPrime/CAnimData.s similarity index 100% rename from asm/Kyoto_CWD/CAnimData.s rename to asm/MetroidPrime/CAnimData.s diff --git a/asm/Kyoto_CWD/CAnimationDatabaseGame.s b/asm/MetroidPrime/CAnimationDatabaseGame.s similarity index 100% rename from asm/Kyoto_CWD/CAnimationDatabaseGame.s rename to asm/MetroidPrime/CAnimationDatabaseGame.s diff --git a/asm/Kyoto_CWD/CArchMsgParmControllerStatus.s b/asm/MetroidPrime/CArchMsgParmControllerStatus.s similarity index 100% rename from asm/Kyoto_CWD/CArchMsgParmControllerStatus.s rename to asm/MetroidPrime/CArchMsgParmControllerStatus.s diff --git a/asm/Kyoto_CWD/CArchMsgParmInt32.s b/asm/MetroidPrime/CArchMsgParmInt32.s similarity index 100% rename from asm/Kyoto_CWD/CArchMsgParmInt32.s rename to asm/MetroidPrime/CArchMsgParmInt32.s diff --git a/asm/Kyoto_CWD/CArchMsgParmInt32Int32VoidPtr.s b/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s similarity index 100% rename from asm/Kyoto_CWD/CArchMsgParmInt32Int32VoidPtr.s rename to asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s diff --git a/asm/Kyoto_CWD/CArchMsgParmNull.s b/asm/MetroidPrime/CArchMsgParmNull.s similarity index 100% rename from asm/Kyoto_CWD/CArchMsgParmNull.s rename to asm/MetroidPrime/CArchMsgParmNull.s diff --git a/asm/Kyoto_CWD/CArchMsgParmReal32.s b/asm/MetroidPrime/CArchMsgParmReal32.s similarity index 100% rename from asm/Kyoto_CWD/CArchMsgParmReal32.s rename to asm/MetroidPrime/CArchMsgParmReal32.s diff --git a/asm/Kyoto_CWD/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s similarity index 100% rename from asm/Kyoto_CWD/CArtifactDoll.s rename to asm/MetroidPrime/CArtifactDoll.s diff --git a/asm/Kyoto_CWD/CAudioStateWin.s b/asm/MetroidPrime/CAudioStateWin.s similarity index 100% rename from asm/Kyoto_CWD/CAudioStateWin.s rename to asm/MetroidPrime/CAudioStateWin.s diff --git a/asm/Kyoto_CWD/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s similarity index 100% rename from asm/Kyoto_CWD/CAutoMapper.s rename to asm/MetroidPrime/CAutoMapper.s diff --git a/asm/Kyoto_CWD/CAutoSave.s b/asm/MetroidPrime/CAutoSave.s similarity index 100% rename from asm/Kyoto_CWD/CAutoSave.s rename to asm/MetroidPrime/CAutoSave.s diff --git a/asm/Kyoto_CWD/CAxisAngle.s b/asm/MetroidPrime/CAxisAngle.s similarity index 100% rename from asm/Kyoto_CWD/CAxisAngle.s rename to asm/MetroidPrime/CAxisAngle.s diff --git a/asm/Kyoto_CWD/CBallFilter.s b/asm/MetroidPrime/CBallFilter.s similarity index 100% rename from asm/Kyoto_CWD/CBallFilter.s rename to asm/MetroidPrime/CBallFilter.s diff --git a/asm/Kyoto_CWD/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s similarity index 100% rename from asm/Kyoto_CWD/CBoneTracking.s rename to asm/MetroidPrime/CBoneTracking.s diff --git a/asm/Kyoto_CWD/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s similarity index 100% rename from asm/Kyoto_CWD/CCollisionActor.s rename to asm/MetroidPrime/CCollisionActor.s diff --git a/asm/Kyoto_CWD/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s similarity index 100% rename from asm/Kyoto_CWD/CCollisionActorManager.s rename to asm/MetroidPrime/CCollisionActorManager.s diff --git a/asm/Kyoto_CWD/CConsoleOutputWindow.s b/asm/MetroidPrime/CConsoleOutputWindow.s similarity index 100% rename from asm/Kyoto_CWD/CConsoleOutputWindow.s rename to asm/MetroidPrime/CConsoleOutputWindow.s diff --git a/asm/Kyoto_CWD/CControlMapper.s b/asm/MetroidPrime/CControlMapper.s similarity index 100% rename from asm/Kyoto_CWD/CControlMapper.s rename to asm/MetroidPrime/CControlMapper.s diff --git a/asm/Kyoto_CWD/CCredits.s b/asm/MetroidPrime/CCredits.s similarity index 100% rename from asm/Kyoto_CWD/CCredits.s rename to asm/MetroidPrime/CCredits.s diff --git a/asm/Kyoto_CWD/CDamageInfo.s b/asm/MetroidPrime/CDamageInfo.s similarity index 100% rename from asm/Kyoto_CWD/CDamageInfo.s rename to asm/MetroidPrime/CDamageInfo.s diff --git a/asm/Kyoto_CWD/CDamageVulnerability.s b/asm/MetroidPrime/CDamageVulnerability.s similarity index 100% rename from asm/Kyoto_CWD/CDamageVulnerability.s rename to asm/MetroidPrime/CDamageVulnerability.s diff --git a/asm/Kyoto_CWD/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s similarity index 100% rename from asm/Kyoto_CWD/CDecalManager.s rename to asm/MetroidPrime/CDecalManager.s diff --git a/asm/Kyoto_CWD/CEntity.s b/asm/MetroidPrime/CEntity.s similarity index 100% rename from asm/Kyoto_CWD/CEntity.s rename to asm/MetroidPrime/CEntity.s diff --git a/asm/Kyoto_CWD/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s similarity index 100% rename from asm/Kyoto_CWD/CEnvFxManager.s rename to asm/MetroidPrime/CEnvFxManager.s diff --git a/asm/Kyoto_CWD/CErrorOutputWindow.s b/asm/MetroidPrime/CErrorOutputWindow.s similarity index 100% rename from asm/Kyoto_CWD/CErrorOutputWindow.s rename to asm/MetroidPrime/CErrorOutputWindow.s diff --git a/asm/Kyoto_CWD/CEulerAngles.s b/asm/MetroidPrime/CEulerAngles.s similarity index 100% rename from asm/Kyoto_CWD/CEulerAngles.s rename to asm/MetroidPrime/CEulerAngles.s diff --git a/asm/Kyoto_CWD/CExplosion.s b/asm/MetroidPrime/CExplosion.s similarity index 100% rename from asm/Kyoto_CWD/CExplosion.s rename to asm/MetroidPrime/CExplosion.s diff --git a/asm/Kyoto_CWD/CFlameWarp.s b/asm/MetroidPrime/CFlameWarp.s similarity index 100% rename from asm/Kyoto_CWD/CFlameWarp.s rename to asm/MetroidPrime/CFlameWarp.s diff --git a/asm/Kyoto_CWD/CFluidPlane.s b/asm/MetroidPrime/CFluidPlane.s similarity index 100% rename from asm/Kyoto_CWD/CFluidPlane.s rename to asm/MetroidPrime/CFluidPlane.s diff --git a/asm/Kyoto_CWD/CFluidPlaneCPU.s b/asm/MetroidPrime/CFluidPlaneCPU.s similarity index 100% rename from asm/Kyoto_CWD/CFluidPlaneCPU.s rename to asm/MetroidPrime/CFluidPlaneCPU.s diff --git a/asm/Kyoto_CWD/CFluidPlaneDoor.s b/asm/MetroidPrime/CFluidPlaneDoor.s similarity index 100% rename from asm/Kyoto_CWD/CFluidPlaneDoor.s rename to asm/MetroidPrime/CFluidPlaneDoor.s diff --git a/asm/Kyoto_CWD/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s similarity index 100% rename from asm/Kyoto_CWD/CFluidPlaneManager.s rename to asm/MetroidPrime/CFluidPlaneManager.s diff --git a/asm/Kyoto_CWD/CFluidPlaneRender.s b/asm/MetroidPrime/CFluidPlaneRender.s similarity index 100% rename from asm/Kyoto_CWD/CFluidPlaneRender.s rename to asm/MetroidPrime/CFluidPlaneRender.s diff --git a/asm/Kyoto_CWD/CFluidUVMotion.s b/asm/MetroidPrime/CFluidUVMotion.s similarity index 100% rename from asm/Kyoto_CWD/CFluidUVMotion.s rename to asm/MetroidPrime/CFluidUVMotion.s diff --git a/asm/Kyoto_CWD/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s similarity index 100% rename from asm/Kyoto_CWD/CFrontEndUI.s rename to asm/MetroidPrime/CFrontEndUI.s diff --git a/asm/Kyoto_CWD/CGBASupport.s b/asm/MetroidPrime/CGBASupport.s similarity index 100% rename from asm/Kyoto_CWD/CGBASupport.s rename to asm/MetroidPrime/CGBASupport.s diff --git a/asm/Kyoto_CWD/CGameArea.s b/asm/MetroidPrime/CGameArea.s similarity index 100% rename from asm/Kyoto_CWD/CGameArea.s rename to asm/MetroidPrime/CGameArea.s diff --git a/asm/Kyoto_CWD/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s similarity index 100% rename from asm/Kyoto_CWD/CGameCollision.s rename to asm/MetroidPrime/CGameCollision.s diff --git a/asm/Kyoto_CWD/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s similarity index 100% rename from asm/Kyoto_CWD/CGameCubeDoll.s rename to asm/MetroidPrime/CGameCubeDoll.s diff --git a/asm/Kyoto_CWD/CGameLight.s b/asm/MetroidPrime/CGameLight.s similarity index 100% rename from asm/Kyoto_CWD/CGameLight.s rename to asm/MetroidPrime/CGameLight.s diff --git a/asm/Kyoto_CWD/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s similarity index 100% rename from asm/Kyoto_CWD/CGameProjectile.s rename to asm/MetroidPrime/CGameProjectile.s diff --git a/asm/Kyoto_CWD/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s similarity index 100% rename from asm/Kyoto_CWD/CGroundMovement.s rename to asm/MetroidPrime/CGroundMovement.s diff --git a/asm/Kyoto_CWD/CHealthInfo.s b/asm/MetroidPrime/CHealthInfo.s similarity index 100% rename from asm/Kyoto_CWD/CHealthInfo.s rename to asm/MetroidPrime/CHealthInfo.s diff --git a/asm/Kyoto_CWD/CIOWin.s b/asm/MetroidPrime/CIOWin.s similarity index 100% rename from asm/Kyoto_CWD/CIOWin.s rename to asm/MetroidPrime/CIOWin.s diff --git a/asm/Kyoto_CWD/CIOWinManager.s b/asm/MetroidPrime/CIOWinManager.s similarity index 100% rename from asm/Kyoto_CWD/CIOWinManager.s rename to asm/MetroidPrime/CIOWinManager.s diff --git a/asm/Kyoto_CWD/CIkChain.s b/asm/MetroidPrime/CIkChain.s similarity index 100% rename from asm/Kyoto_CWD/CIkChain.s rename to asm/MetroidPrime/CIkChain.s diff --git a/asm/Kyoto_CWD/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s similarity index 100% rename from asm/Kyoto_CWD/CInGameGuiManager.s rename to asm/MetroidPrime/CInGameGuiManager.s diff --git a/asm/Kyoto_CWD/CInGameTweakManager.s b/asm/MetroidPrime/CInGameTweakManager.s similarity index 100% rename from asm/Kyoto_CWD/CInGameTweakManager.s rename to asm/MetroidPrime/CInGameTweakManager.s diff --git a/asm/Kyoto_CWD/CInputGenerator.s b/asm/MetroidPrime/CInputGenerator.s similarity index 100% rename from asm/Kyoto_CWD/CInputGenerator.s rename to asm/MetroidPrime/CInputGenerator.s diff --git a/asm/Kyoto_CWD/CInstruction.s b/asm/MetroidPrime/CInstruction.s similarity index 100% rename from asm/Kyoto_CWD/CInstruction.s rename to asm/MetroidPrime/CInstruction.s diff --git a/asm/Kyoto_CWD/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s similarity index 100% rename from asm/Kyoto_CWD/CInventoryScreen.s rename to asm/MetroidPrime/CInventoryScreen.s diff --git a/asm/Kyoto_CWD/CLightParameters.s b/asm/MetroidPrime/CLightParameters.s similarity index 100% rename from asm/Kyoto_CWD/CLightParameters.s rename to asm/MetroidPrime/CLightParameters.s diff --git a/asm/Kyoto_CWD/CLogBookScreen.s b/asm/MetroidPrime/CLogBookScreen.s similarity index 100% rename from asm/Kyoto_CWD/CLogBookScreen.s rename to asm/MetroidPrime/CLogBookScreen.s diff --git a/asm/Kyoto_CWD/CMFGame.s b/asm/MetroidPrime/CMFGame.s similarity index 100% rename from asm/Kyoto_CWD/CMFGame.s rename to asm/MetroidPrime/CMFGame.s diff --git a/asm/Kyoto_CWD/CMFGameLoader.s b/asm/MetroidPrime/CMFGameLoader.s similarity index 100% rename from asm/Kyoto_CWD/CMFGameLoader.s rename to asm/MetroidPrime/CMFGameLoader.s diff --git a/asm/Kyoto_CWD/CMainFlow.s b/asm/MetroidPrime/CMainFlow.s similarity index 100% rename from asm/Kyoto_CWD/CMainFlow.s rename to asm/MetroidPrime/CMainFlow.s diff --git a/asm/Kyoto_CWD/CMapArea.s b/asm/MetroidPrime/CMapArea.s similarity index 100% rename from asm/Kyoto_CWD/CMapArea.s rename to asm/MetroidPrime/CMapArea.s diff --git a/asm/Kyoto_CWD/CMapUniverse.s b/asm/MetroidPrime/CMapUniverse.s similarity index 100% rename from asm/Kyoto_CWD/CMapUniverse.s rename to asm/MetroidPrime/CMapUniverse.s diff --git a/asm/Kyoto_CWD/CMapWorld.s b/asm/MetroidPrime/CMapWorld.s similarity index 100% rename from asm/Kyoto_CWD/CMapWorld.s rename to asm/MetroidPrime/CMapWorld.s diff --git a/asm/Kyoto_CWD/CMapWorldInfo.s b/asm/MetroidPrime/CMapWorldInfo.s similarity index 100% rename from asm/Kyoto_CWD/CMapWorldInfo.s rename to asm/MetroidPrime/CMapWorldInfo.s diff --git a/asm/Kyoto_CWD/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s similarity index 100% rename from asm/Kyoto_CWD/CMappableObject.s rename to asm/MetroidPrime/CMappableObject.s diff --git a/asm/Kyoto_CWD/CMemoryCardDriver.s b/asm/MetroidPrime/CMemoryCardDriver.s similarity index 100% rename from asm/Kyoto_CWD/CMemoryCardDriver.s rename to asm/MetroidPrime/CMemoryCardDriver.s diff --git a/asm/Kyoto_CWD/CMemoryDrawEnum.s b/asm/MetroidPrime/CMemoryDrawEnum.s similarity index 100% rename from asm/Kyoto_CWD/CMemoryDrawEnum.s rename to asm/MetroidPrime/CMemoryDrawEnum.s diff --git a/asm/Kyoto_CWD/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s similarity index 100% rename from asm/Kyoto_CWD/CMessageScreen.s rename to asm/MetroidPrime/CMessageScreen.s diff --git a/asm/Kyoto_CWD/CModelData.s b/asm/MetroidPrime/CModelData.s similarity index 100% rename from asm/Kyoto_CWD/CModelData.s rename to asm/MetroidPrime/CModelData.s diff --git a/asm/Kyoto_CWD/CNESEmulator.s b/asm/MetroidPrime/CNESEmulator.s similarity index 100% rename from asm/Kyoto_CWD/CNESEmulator.s rename to asm/MetroidPrime/CNESEmulator.s diff --git a/asm/Kyoto_CWD/CObjectList.s b/asm/MetroidPrime/CObjectList.s similarity index 100% rename from asm/Kyoto_CWD/CObjectList.s rename to asm/MetroidPrime/CObjectList.s diff --git a/asm/Kyoto_CWD/CParticleDatabase.s b/asm/MetroidPrime/CParticleDatabase.s similarity index 100% rename from asm/Kyoto_CWD/CParticleDatabase.s rename to asm/MetroidPrime/CParticleDatabase.s diff --git a/asm/Kyoto_CWD/CParticleGenInfo.s b/asm/MetroidPrime/CParticleGenInfo.s similarity index 100% rename from asm/Kyoto_CWD/CParticleGenInfo.s rename to asm/MetroidPrime/CParticleGenInfo.s diff --git a/asm/Kyoto_CWD/CParticleGenInfoGeneric.s b/asm/MetroidPrime/CParticleGenInfoGeneric.s similarity index 100% rename from asm/Kyoto_CWD/CParticleGenInfoGeneric.s rename to asm/MetroidPrime/CParticleGenInfoGeneric.s diff --git a/asm/Kyoto_CWD/CPauseScreen.s b/asm/MetroidPrime/CPauseScreen.s similarity index 100% rename from asm/Kyoto_CWD/CPauseScreen.s rename to asm/MetroidPrime/CPauseScreen.s diff --git a/asm/Kyoto_CWD/CPauseScreenBase.s b/asm/MetroidPrime/CPauseScreenBase.s similarity index 100% rename from asm/Kyoto_CWD/CPauseScreenBase.s rename to asm/MetroidPrime/CPauseScreenBase.s diff --git a/asm/Kyoto_CWD/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s similarity index 100% rename from asm/Kyoto_CWD/CPauseScreenBlur.s rename to asm/MetroidPrime/CPauseScreenBlur.s diff --git a/asm/Kyoto_CWD/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s similarity index 100% rename from asm/Kyoto_CWD/CPauseScreenFrame.s rename to asm/MetroidPrime/CPauseScreenFrame.s diff --git a/asm/Kyoto_CWD/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s similarity index 100% rename from asm/Kyoto_CWD/CPhysicsActor.s rename to asm/MetroidPrime/CPhysicsActor.s diff --git a/asm/Kyoto_CWD/CPhysicsState.s b/asm/MetroidPrime/CPhysicsState.s similarity index 100% rename from asm/Kyoto_CWD/CPhysicsState.s rename to asm/MetroidPrime/CPhysicsState.s diff --git a/asm/Kyoto_CWD/CPlayMovie.s b/asm/MetroidPrime/CPlayMovie.s similarity index 100% rename from asm/Kyoto_CWD/CPlayMovie.s rename to asm/MetroidPrime/CPlayMovie.s diff --git a/asm/Kyoto_CWD/CPreFrontEnd.s b/asm/MetroidPrime/CPreFrontEnd.s similarity index 100% rename from asm/Kyoto_CWD/CPreFrontEnd.s rename to asm/MetroidPrime/CPreFrontEnd.s diff --git a/asm/Kyoto_CWD/CProjectedShadow.s b/asm/MetroidPrime/CProjectedShadow.s similarity index 100% rename from asm/Kyoto_CWD/CProjectedShadow.s rename to asm/MetroidPrime/CProjectedShadow.s diff --git a/asm/Kyoto_CWD/CQuitGameScreen.s b/asm/MetroidPrime/CQuitGameScreen.s similarity index 100% rename from asm/Kyoto_CWD/CQuitGameScreen.s rename to asm/MetroidPrime/CQuitGameScreen.s diff --git a/asm/Kyoto_CWD/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s similarity index 100% rename from asm/Kyoto_CWD/CRagDoll.s rename to asm/MetroidPrime/CRagDoll.s diff --git a/asm/Kyoto_CWD/CRainSplashGenerator.s b/asm/MetroidPrime/CRainSplashGenerator.s similarity index 100% rename from asm/Kyoto_CWD/CRainSplashGenerator.s rename to asm/MetroidPrime/CRainSplashGenerator.s diff --git a/asm/Kyoto_CWD/CRipple.s b/asm/MetroidPrime/CRipple.s similarity index 100% rename from asm/Kyoto_CWD/CRipple.s rename to asm/MetroidPrime/CRipple.s diff --git a/asm/Kyoto_CWD/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s similarity index 100% rename from asm/Kyoto_CWD/CRippleManager.s rename to asm/MetroidPrime/CRippleManager.s diff --git a/asm/Kyoto_CWD/CRumbleManager.s b/asm/MetroidPrime/CRumbleManager.s similarity index 100% rename from asm/Kyoto_CWD/CRumbleManager.s rename to asm/MetroidPrime/CRumbleManager.s diff --git a/asm/Kyoto_CWD/CSWDataDolphin.s b/asm/MetroidPrime/CSWDataDolphin.s similarity index 100% rename from asm/Kyoto_CWD/CSWDataDolphin.s rename to asm/MetroidPrime/CSWDataDolphin.s diff --git a/asm/Kyoto_CWD/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s similarity index 100% rename from asm/Kyoto_CWD/CSamusDoll.s rename to asm/MetroidPrime/CSamusDoll.s diff --git a/asm/Kyoto_CWD/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s similarity index 100% rename from asm/Kyoto_CWD/CSaveGameScreen.s rename to asm/MetroidPrime/CSaveGameScreen.s diff --git a/asm/Kyoto_CWD/CScriptMailbox.s b/asm/MetroidPrime/CScriptMailbox.s similarity index 100% rename from asm/Kyoto_CWD/CScriptMailbox.s rename to asm/MetroidPrime/CScriptMailbox.s diff --git a/asm/Kyoto_CWD/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s similarity index 100% rename from asm/Kyoto_CWD/CSimpleShadow.s rename to asm/MetroidPrime/CSimpleShadow.s diff --git a/asm/Kyoto_CWD/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s similarity index 100% rename from asm/Kyoto_CWD/CSlideShow.s rename to asm/MetroidPrime/CSlideShow.s diff --git a/asm/Kyoto_CWD/CSortedLists.s b/asm/MetroidPrime/CSortedLists.s similarity index 100% rename from asm/Kyoto_CWD/CSortedLists.s rename to asm/MetroidPrime/CSortedLists.s diff --git a/asm/Kyoto_CWD/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s similarity index 100% rename from asm/Kyoto_CWD/CSplashScreen.s rename to asm/MetroidPrime/CSplashScreen.s diff --git a/asm/Kyoto_CWD/CStateManager.s b/asm/MetroidPrime/CStateManager.s similarity index 100% rename from asm/Kyoto_CWD/CStateManager.s rename to asm/MetroidPrime/CStateManager.s diff --git a/asm/Kyoto_CWD/CSteeringBehaviors.s b/asm/MetroidPrime/CSteeringBehaviors.s similarity index 100% rename from asm/Kyoto_CWD/CSteeringBehaviors.s rename to asm/MetroidPrime/CSteeringBehaviors.s diff --git a/asm/Kyoto_CWD/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s similarity index 100% rename from asm/Kyoto_CWD/CTargetReticles.s rename to asm/MetroidPrime/CTargetReticles.s diff --git a/asm/Kyoto_CWD/CTransitionDatabaseGame.s b/asm/MetroidPrime/CTransitionDatabaseGame.s similarity index 100% rename from asm/Kyoto_CWD/CTransitionDatabaseGame.s rename to asm/MetroidPrime/CTransitionDatabaseGame.s diff --git a/asm/Kyoto_CWD/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s similarity index 100% rename from asm/Kyoto_CWD/CVisorFlare.s rename to asm/MetroidPrime/CVisorFlare.s diff --git a/asm/Kyoto_CWD/CWeaponMgr.s b/asm/MetroidPrime/CWeaponMgr.s similarity index 100% rename from asm/Kyoto_CWD/CWeaponMgr.s rename to asm/MetroidPrime/CWeaponMgr.s diff --git a/asm/Kyoto_CWD/CWorld.s b/asm/MetroidPrime/CWorld.s similarity index 100% rename from asm/Kyoto_CWD/CWorld.s rename to asm/MetroidPrime/CWorld.s diff --git a/asm/Kyoto_CWD/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s similarity index 100% rename from asm/Kyoto_CWD/CWorldShadow.s rename to asm/MetroidPrime/CWorldShadow.s diff --git a/asm/Kyoto_CWD/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s similarity index 100% rename from asm/Kyoto_CWD/CWorldTransManager.s rename to asm/MetroidPrime/CWorldTransManager.s diff --git a/asm/Kyoto_CWD/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CBallCamera.s rename to asm/MetroidPrime/Cameras/CBallCamera.s diff --git a/asm/Kyoto_CWD/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CBallCameraFailsafeState.s rename to asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s diff --git a/asm/Kyoto_CWD/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CCameraFilter.s rename to asm/MetroidPrime/Cameras/CCameraFilter.s diff --git a/asm/Kyoto_CWD/Cameras/CCameraHint.s b/asm/MetroidPrime/Cameras/CCameraHint.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CCameraHint.s rename to asm/MetroidPrime/Cameras/CCameraHint.s diff --git a/asm/Kyoto_CWD/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CCameraManager.s rename to asm/MetroidPrime/Cameras/CCameraManager.s diff --git a/asm/Kyoto_CWD/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CCameraShakeData.s rename to asm/MetroidPrime/Cameras/CCameraShakeData.s diff --git a/asm/Kyoto_CWD/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CCinematicCamera.s rename to asm/MetroidPrime/Cameras/CCinematicCamera.s diff --git a/asm/Kyoto_CWD/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CFirstPersonCamera.s rename to asm/MetroidPrime/Cameras/CFirstPersonCamera.s diff --git a/asm/Kyoto_CWD/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CGameCamera.s rename to asm/MetroidPrime/Cameras/CGameCamera.s diff --git a/asm/Kyoto_CWD/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CInterpolationCamera.s rename to asm/MetroidPrime/Cameras/CInterpolationCamera.s diff --git a/asm/Kyoto_CWD/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s similarity index 100% rename from asm/Kyoto_CWD/Cameras/CPathCamera.s rename to asm/MetroidPrime/Cameras/CPathCamera.s diff --git a/asm/Kyoto_CWD/Clamp_int.s b/asm/MetroidPrime/Clamp_int.s similarity index 100% rename from asm/Kyoto_CWD/Clamp_int.s rename to asm/MetroidPrime/Clamp_int.s diff --git a/asm/Kyoto_CWD/Decode.s b/asm/MetroidPrime/Decode.s similarity index 100% rename from asm/Kyoto_CWD/Decode.s rename to asm/MetroidPrime/Decode.s diff --git a/asm/Kyoto_CWD/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CActorContraption.s rename to asm/MetroidPrime/Enemies/CActorContraption.s diff --git a/asm/Kyoto_CWD/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CAi.s rename to asm/MetroidPrime/Enemies/CAi.s diff --git a/asm/Kyoto_CWD/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CAmbientAI.s rename to asm/MetroidPrime/Enemies/CAmbientAI.s diff --git a/asm/Kyoto_CWD/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CAtomicAlpha.s rename to asm/MetroidPrime/Enemies/CAtomicAlpha.s diff --git a/asm/Kyoto_CWD/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CAtomicBeta.s rename to asm/MetroidPrime/Enemies/CAtomicBeta.s diff --git a/asm/Kyoto_CWD/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBabygoth.s rename to asm/MetroidPrime/Enemies/CBabygoth.s diff --git a/asm/Kyoto_CWD/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBeetle.s rename to asm/MetroidPrime/Enemies/CBeetle.s diff --git a/asm/Kyoto_CWD/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBloodFlower.s rename to asm/MetroidPrime/Enemies/CBloodFlower.s diff --git a/asm/Kyoto_CWD/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBouncyGrenade.s rename to asm/MetroidPrime/Enemies/CBouncyGrenade.s diff --git a/asm/Kyoto_CWD/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBurrower.s rename to asm/MetroidPrime/Enemies/CBurrower.s diff --git a/asm/Kyoto_CWD/Enemies/CBurstFire.s b/asm/MetroidPrime/Enemies/CBurstFire.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CBurstFire.s rename to asm/MetroidPrime/Enemies/CBurstFire.s diff --git a/asm/Kyoto_CWD/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CChozoGhost.s rename to asm/MetroidPrime/Enemies/CChozoGhost.s diff --git a/asm/Kyoto_CWD/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CDrone.s rename to asm/MetroidPrime/Enemies/CDrone.s diff --git a/asm/Kyoto_CWD/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CElitePirate.s rename to asm/MetroidPrime/Enemies/CElitePirate.s diff --git a/asm/Kyoto_CWD/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CEyeBall.s rename to asm/MetroidPrime/Enemies/CEyeBall.s diff --git a/asm/Kyoto_CWD/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFireFlea.s rename to asm/MetroidPrime/Enemies/CFireFlea.s diff --git a/asm/Kyoto_CWD/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFlaahgra.s rename to asm/MetroidPrime/Enemies/CFlaahgra.s diff --git a/asm/Kyoto_CWD/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFlaahgraPlants.s rename to asm/MetroidPrime/Enemies/CFlaahgraPlants.s diff --git a/asm/Kyoto_CWD/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFlaahgraTentacle.s rename to asm/MetroidPrime/Enemies/CFlaahgraTentacle.s diff --git a/asm/Kyoto_CWD/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFlickerBat.s rename to asm/MetroidPrime/Enemies/CFlickerBat.s diff --git a/asm/Kyoto_CWD/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CFlyingPirate.s rename to asm/MetroidPrime/Enemies/CFlyingPirate.s diff --git a/asm/Kyoto_CWD/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CGrenadeLauncher.s rename to asm/MetroidPrime/Enemies/CGrenadeLauncher.s diff --git a/asm/Kyoto_CWD/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CIceSheegoth.s rename to asm/MetroidPrime/Enemies/CIceSheegoth.s diff --git a/asm/Kyoto_CWD/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CJellyZap.s rename to asm/MetroidPrime/Enemies/CJellyZap.s diff --git a/asm/Kyoto_CWD/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CKnockBackController.s rename to asm/MetroidPrime/Enemies/CKnockBackController.s diff --git a/asm/Kyoto_CWD/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMagdolite.s rename to asm/MetroidPrime/Enemies/CMagdolite.s diff --git a/asm/Kyoto_CWD/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetaree.s rename to asm/MetroidPrime/Enemies/CMetaree.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroid.s rename to asm/MetroidPrime/Enemies/CMetroid.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroidBeta.s rename to asm/MetroidPrime/Enemies/CMetroidBeta.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroidPrimeEssence.s rename to asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroidPrimeExo.s rename to asm/MetroidPrime/Enemies/CMetroidPrimeExo.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroidPrimeProjectile.s rename to asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s diff --git a/asm/Kyoto_CWD/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CMetroidPrimeRelay.s rename to asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s diff --git a/asm/Kyoto_CWD/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CNewIntroBoss.s rename to asm/MetroidPrime/Enemies/CNewIntroBoss.s diff --git a/asm/Kyoto_CWD/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/COmegaPirate.s rename to asm/MetroidPrime/Enemies/COmegaPirate.s diff --git a/asm/Kyoto_CWD/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CParasite.s rename to asm/MetroidPrime/Enemies/CParasite.s diff --git a/asm/Kyoto_CWD/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPatterned.s rename to asm/MetroidPrime/Enemies/CPatterned.s diff --git a/asm/Kyoto_CWD/Enemies/CPatternedInfo.s b/asm/MetroidPrime/Enemies/CPatternedInfo.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPatternedInfo.s rename to asm/MetroidPrime/Enemies/CPatternedInfo.s diff --git a/asm/Kyoto_CWD/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPhazonHealingNodule.s rename to asm/MetroidPrime/Enemies/CPhazonHealingNodule.s diff --git a/asm/Kyoto_CWD/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPhazonPool.s rename to asm/MetroidPrime/Enemies/CPhazonPool.s diff --git a/asm/Kyoto_CWD/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPuddleSpore.s rename to asm/MetroidPrime/Enemies/CPuddleSpore.s diff --git a/asm/Kyoto_CWD/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPuddleToadGamma.s rename to asm/MetroidPrime/Enemies/CPuddleToadGamma.s diff --git a/asm/Kyoto_CWD/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CPuffer.s rename to asm/MetroidPrime/Enemies/CPuffer.s diff --git a/asm/Kyoto_CWD/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CRidley.s rename to asm/MetroidPrime/Enemies/CRidley.s diff --git a/asm/Kyoto_CWD/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CRipper.s rename to asm/MetroidPrime/Enemies/CRipper.s diff --git a/asm/Kyoto_CWD/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CRipperControlledPlatform.s rename to asm/MetroidPrime/Enemies/CRipperControlledPlatform.s diff --git a/asm/Kyoto_CWD/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CSeedling.s rename to asm/MetroidPrime/Enemies/CSeedling.s diff --git a/asm/Kyoto_CWD/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CSnakeWeedSwarm.s rename to asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s diff --git a/asm/Kyoto_CWD/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CSpacePirate.s rename to asm/MetroidPrime/Enemies/CSpacePirate.s diff --git a/asm/Kyoto_CWD/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CSpankWeed.s rename to asm/MetroidPrime/Enemies/CSpankWeed.s diff --git a/asm/Kyoto_CWD/Enemies/CStateMachine.s b/asm/MetroidPrime/Enemies/CStateMachine.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CStateMachine.s rename to asm/MetroidPrime/Enemies/CStateMachine.s diff --git a/asm/Kyoto_CWD/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CTeamAiMgr.s rename to asm/MetroidPrime/Enemies/CTeamAiMgr.s diff --git a/asm/Kyoto_CWD/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CThardus.s rename to asm/MetroidPrime/Enemies/CThardus.s diff --git a/asm/Kyoto_CWD/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CThardusRockProjectile.s rename to asm/MetroidPrime/Enemies/CThardusRockProjectile.s diff --git a/asm/Kyoto_CWD/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CTryclops.s rename to asm/MetroidPrime/Enemies/CTryclops.s diff --git a/asm/Kyoto_CWD/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CWallCrawlerSwarm.s rename to asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s diff --git a/asm/Kyoto_CWD/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CWallWalker.s rename to asm/MetroidPrime/Enemies/CWallWalker.s diff --git a/asm/Kyoto_CWD/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/CWarWasp.s rename to asm/MetroidPrime/Enemies/CWarWasp.s diff --git a/asm/Kyoto_CWD/Enemies/PatternedCastTo.s b/asm/MetroidPrime/Enemies/PatternedCastTo.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/PatternedCastTo.s rename to asm/MetroidPrime/Enemies/PatternedCastTo.s diff --git a/asm/Kyoto_CWD/Enemies/SPositionHistory.s b/asm/MetroidPrime/Enemies/SPositionHistory.s similarity index 100% rename from asm/Kyoto_CWD/Enemies/SPositionHistory.s rename to asm/MetroidPrime/Enemies/SPositionHistory.s diff --git a/asm/Kyoto_CWD/Factories/CAssetFactory.s b/asm/MetroidPrime/Factories/CAssetFactory.s similarity index 100% rename from asm/Kyoto_CWD/Factories/CAssetFactory.s rename to asm/MetroidPrime/Factories/CAssetFactory.s diff --git a/asm/Kyoto_CWD/Factories/CCharacterFactory.s b/asm/MetroidPrime/Factories/CCharacterFactory.s similarity index 100% rename from asm/Kyoto_CWD/Factories/CCharacterFactory.s rename to asm/MetroidPrime/Factories/CCharacterFactory.s diff --git a/asm/Kyoto_CWD/Factories/CSaveWorldFactory.s b/asm/MetroidPrime/Factories/CSaveWorldFactory.s similarity index 100% rename from asm/Kyoto_CWD/Factories/CSaveWorldFactory.s rename to asm/MetroidPrime/Factories/CSaveWorldFactory.s diff --git a/asm/Kyoto_CWD/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s similarity index 100% rename from asm/Kyoto_CWD/Factories/CScannableObjectInfo.s rename to asm/MetroidPrime/Factories/CScannableObjectInfo.s diff --git a/asm/Kyoto_CWD/Factories/CStateMachineFactory.s b/asm/MetroidPrime/Factories/CStateMachineFactory.s similarity index 100% rename from asm/Kyoto_CWD/Factories/CStateMachineFactory.s rename to asm/MetroidPrime/Factories/CStateMachineFactory.s diff --git a/asm/Kyoto_CWD/GameObjectLists.s b/asm/MetroidPrime/GameObjectLists.s similarity index 100% rename from asm/Kyoto_CWD/GameObjectLists.s rename to asm/MetroidPrime/GameObjectLists.s diff --git a/asm/Kyoto_CWD/HUD/CHUDMemoParms.s b/asm/MetroidPrime/HUD/CHUDMemoParms.s similarity index 100% rename from asm/Kyoto_CWD/HUD/CHUDMemoParms.s rename to asm/MetroidPrime/HUD/CHUDMemoParms.s diff --git a/asm/Kyoto_CWD/HUD/CHudBallInterface.s b/asm/MetroidPrime/HUD/CHudBallInterface.s similarity index 100% rename from asm/Kyoto_CWD/HUD/CHudBallInterface.s rename to asm/MetroidPrime/HUD/CHudBallInterface.s diff --git a/asm/Kyoto_CWD/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s similarity index 100% rename from asm/Kyoto_CWD/HUD/CHudDecoInterface.s rename to asm/MetroidPrime/HUD/CHudDecoInterface.s diff --git a/asm/Kyoto_CWD/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s similarity index 100% rename from asm/Kyoto_CWD/HUD/CSamusHud.s rename to asm/MetroidPrime/HUD/CSamusHud.s diff --git a/asm/Kyoto_CWD/PathFinding/CPathFindArea.s b/asm/MetroidPrime/PathFinding/CPathFindArea.s similarity index 100% rename from asm/Kyoto_CWD/PathFinding/CPathFindArea.s rename to asm/MetroidPrime/PathFinding/CPathFindArea.s diff --git a/asm/Kyoto_CWD/PathFinding/CPathFindRegion.s b/asm/MetroidPrime/PathFinding/CPathFindRegion.s similarity index 100% rename from asm/Kyoto_CWD/PathFinding/CPathFindRegion.s rename to asm/MetroidPrime/PathFinding/CPathFindRegion.s diff --git a/asm/Kyoto_CWD/PathFinding/CPathFindSearch.s b/asm/MetroidPrime/PathFinding/CPathFindSearch.s similarity index 100% rename from asm/Kyoto_CWD/PathFinding/CPathFindSearch.s rename to asm/MetroidPrime/PathFinding/CPathFindSearch.s diff --git a/asm/Kyoto_CWD/Player/CFaceplateDecoration.s b/asm/MetroidPrime/Player/CFaceplateDecoration.s similarity index 100% rename from asm/Kyoto_CWD/Player/CFaceplateDecoration.s rename to asm/MetroidPrime/Player/CFaceplateDecoration.s diff --git a/asm/Kyoto_CWD/Player/CFidget.s b/asm/MetroidPrime/Player/CFidget.s similarity index 100% rename from asm/Kyoto_CWD/Player/CFidget.s rename to asm/MetroidPrime/Player/CFidget.s diff --git a/asm/Kyoto_CWD/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s similarity index 100% rename from asm/Kyoto_CWD/Player/CGameHintInfo.s rename to asm/MetroidPrime/Player/CGameHintInfo.s diff --git a/asm/Kyoto_CWD/Player/CGameOptions.s b/asm/MetroidPrime/Player/CGameOptions.s similarity index 100% rename from asm/Kyoto_CWD/Player/CGameOptions.s rename to asm/MetroidPrime/Player/CGameOptions.s diff --git a/asm/Kyoto_CWD/Player/CGameState.s b/asm/MetroidPrime/Player/CGameState.s similarity index 100% rename from asm/Kyoto_CWD/Player/CGameState.s rename to asm/MetroidPrime/Player/CGameState.s diff --git a/asm/Kyoto_CWD/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s similarity index 100% rename from asm/Kyoto_CWD/Player/CGrappleArm.s rename to asm/MetroidPrime/Player/CGrappleArm.s diff --git a/asm/Kyoto_CWD/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s similarity index 100% rename from asm/Kyoto_CWD/Player/CMorphBall.s rename to asm/MetroidPrime/Player/CMorphBall.s diff --git a/asm/Kyoto_CWD/Player/CMorphBallShadow.s b/asm/MetroidPrime/Player/CMorphBallShadow.s similarity index 100% rename from asm/Kyoto_CWD/Player/CMorphBallShadow.s rename to asm/MetroidPrime/Player/CMorphBallShadow.s diff --git a/asm/Kyoto_CWD/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayer.s rename to asm/MetroidPrime/Player/CPlayer.s diff --git a/asm/Kyoto_CWD/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerCameraBob.s rename to asm/MetroidPrime/Player/CPlayerCameraBob.s diff --git a/asm/Kyoto_CWD/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerDynamics.s rename to asm/MetroidPrime/Player/CPlayerDynamics.s diff --git a/asm/Kyoto_CWD/Player/CPlayerEnergyDrain.s b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerEnergyDrain.s rename to asm/MetroidPrime/Player/CPlayerEnergyDrain.s diff --git a/asm/Kyoto_CWD/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerGun.s rename to asm/MetroidPrime/Player/CPlayerGun.s diff --git a/asm/Kyoto_CWD/Player/CPlayerInputFilter.s b/asm/MetroidPrime/Player/CPlayerInputFilter.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerInputFilter.s rename to asm/MetroidPrime/Player/CPlayerInputFilter.s diff --git a/asm/Kyoto_CWD/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerOrbit.s rename to asm/MetroidPrime/Player/CPlayerOrbit.s diff --git a/asm/Kyoto_CWD/Player/CPlayerState.s b/asm/MetroidPrime/Player/CPlayerState.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerState.s rename to asm/MetroidPrime/Player/CPlayerState.s diff --git a/asm/Kyoto_CWD/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s similarity index 100% rename from asm/Kyoto_CWD/Player/CPlayerVisor.s rename to asm/MetroidPrime/Player/CPlayerVisor.s diff --git a/asm/Kyoto_CWD/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s similarity index 100% rename from asm/Kyoto_CWD/Player/CSamusFaceReflection.s rename to asm/MetroidPrime/Player/CSamusFaceReflection.s diff --git a/asm/Kyoto_CWD/Player/CSaveWorld.s b/asm/MetroidPrime/Player/CSaveWorld.s similarity index 100% rename from asm/Kyoto_CWD/Player/CSaveWorld.s rename to asm/MetroidPrime/Player/CSaveWorld.s diff --git a/asm/Kyoto_CWD/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s similarity index 100% rename from asm/Kyoto_CWD/Player/CScanDisplay.s rename to asm/MetroidPrime/Player/CScanDisplay.s diff --git a/asm/Kyoto_CWD/Player/CStaticInterference.s b/asm/MetroidPrime/Player/CStaticInterference.s similarity index 100% rename from asm/Kyoto_CWD/Player/CStaticInterference.s rename to asm/MetroidPrime/Player/CStaticInterference.s diff --git a/asm/Kyoto_CWD/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s similarity index 100% rename from asm/Kyoto_CWD/Player/CWorldLayerState.s rename to asm/MetroidPrime/Player/CWorldLayerState.s diff --git a/asm/Kyoto_CWD/RumbleFxTable.s b/asm/MetroidPrime/RumbleFxTable.s similarity index 100% rename from asm/Kyoto_CWD/RumbleFxTable.s rename to asm/MetroidPrime/RumbleFxTable.s diff --git a/asm/Kyoto_CWD/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s similarity index 100% rename from asm/Kyoto_CWD/ScriptLoader.s rename to asm/MetroidPrime/ScriptLoader.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CEnergyBall.s rename to asm/MetroidPrime/ScriptObjects/CEnergyBall.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CFire.s rename to asm/MetroidPrime/ScriptObjects/CFire.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CFishCloud.s rename to asm/MetroidPrime/ScriptObjects/CFishCloud.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CHUDBillboardEffect.s rename to asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CRepulsor.s rename to asm/MetroidPrime/ScriptObjects/CRepulsor.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptActor.s rename to asm/MetroidPrime/ScriptObjects/CScriptActor.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptActorKeyframe.s rename to asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptActorRotate.s rename to asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptAiJumpPoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptAreaAttributes.s rename to asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptBallTrigger.s rename to asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptBeam.s rename to asm/MetroidPrime/ScriptObjects/CScriptBeam.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraBlurKeyframe.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraFilterKeyframe.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraHint.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraHintTrigger.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraPitchVolume.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraShaker.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCameraWaypoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptColorModulate.s rename to asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptControllerAction.s rename to asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCounter.s b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCounter.s rename to asm/MetroidPrime/ScriptObjects/CScriptCounter.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptCoverPoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDamageableTrigger.s rename to asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDebris.s rename to asm/MetroidPrime/ScriptObjects/CScriptDebris.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDebugCameraWaypoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDistanceFog.s rename to asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDock.s rename to asm/MetroidPrime/ScriptObjects/CScriptDock.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDockAreaChange.s rename to asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptDoor.s rename to asm/MetroidPrime/ScriptObjects/CScriptDoor.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptEMPulse.s rename to asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptEffect.s rename to asm/MetroidPrime/ScriptObjects/CScriptEffect.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptGenerator.s rename to asm/MetroidPrime/ScriptObjects/CScriptGenerator.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptGrapplePoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptGunTurret.s rename to asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptHUDMemo.s rename to asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptMazeNode.s rename to asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptMemoryRelay.s rename to asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptMidi.s rename to asm/MetroidPrime/ScriptObjects/CScriptMidi.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPickup.s rename to asm/MetroidPrime/ScriptObjects/CScriptPickup.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPickupGenerator.s rename to asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPlatform.s rename to asm/MetroidPrime/ScriptObjects/CScriptPlatform.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPlayerActor.s rename to asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPlayerHint.s rename to asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPlayerStateChange.s rename to asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptPointOfInterest.s rename to asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptProjectedShadow.s rename to asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptRandomRelay.s rename to asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptRelay.s rename to asm/MetroidPrime/ScriptObjects/CScriptRelay.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptRipple.s rename to asm/MetroidPrime/ScriptObjects/CScriptRipple.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptRoomAcoustics.s rename to asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSound.s rename to asm/MetroidPrime/ScriptObjects/CScriptSound.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSpawnPoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSpecialFunction.s rename to asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallAttractionSurface.s rename to asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallWaypoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSpindleCamera.s rename to asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSteam.s rename to asm/MetroidPrime/ScriptObjects/CScriptSteam.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptStreamedAudio.s rename to asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptSwitch.s rename to asm/MetroidPrime/ScriptObjects/CScriptSwitch.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptTargetingPoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptTimer.s b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptTimer.s rename to asm/MetroidPrime/ScriptObjects/CScriptTimer.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptTrigger.s rename to asm/MetroidPrime/ScriptObjects/CScriptTrigger.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptVisorFlare.s rename to asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptVisorGoo.s rename to asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptWater.s rename to asm/MetroidPrime/ScriptObjects/CScriptWater.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptWaypoint.s rename to asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s diff --git a/asm/Kyoto_CWD/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s similarity index 100% rename from asm/Kyoto_CWD/ScriptObjects/CScriptWorldTeleporter.s rename to asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s diff --git a/asm/Kyoto_CWD/TCastTo.s b/asm/MetroidPrime/TCastTo.s similarity index 100% rename from asm/Kyoto_CWD/TCastTo.s rename to asm/MetroidPrime/TCastTo.s diff --git a/asm/Kyoto_CWD/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s similarity index 100% rename from asm/Kyoto_CWD/TGameTypes.s rename to asm/MetroidPrime/TGameTypes.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakAutoMapper.s b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakAutoMapper.s rename to asm/MetroidPrime/Tweaks/CTweakAutoMapper.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakBall.s b/asm/MetroidPrime/Tweaks/CTweakBall.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakBall.s rename to asm/MetroidPrime/Tweaks/CTweakBall.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakGame.s b/asm/MetroidPrime/Tweaks/CTweakGame.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakGame.s rename to asm/MetroidPrime/Tweaks/CTweakGame.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakGui.s b/asm/MetroidPrime/Tweaks/CTweakGui.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakGui.s rename to asm/MetroidPrime/Tweaks/CTweakGui.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakGuiColors.s b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakGuiColors.s rename to asm/MetroidPrime/Tweaks/CTweakGuiColors.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakGunRes.s b/asm/MetroidPrime/Tweaks/CTweakGunRes.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakGunRes.s rename to asm/MetroidPrime/Tweaks/CTweakGunRes.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakParticle.s b/asm/MetroidPrime/Tweaks/CTweakParticle.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakParticle.s rename to asm/MetroidPrime/Tweaks/CTweakParticle.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakPlayer.s b/asm/MetroidPrime/Tweaks/CTweakPlayer.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakPlayer.s rename to asm/MetroidPrime/Tweaks/CTweakPlayer.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakPlayerControl.s b/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakPlayerControl.s rename to asm/MetroidPrime/Tweaks/CTweakPlayerControl.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakPlayerGun.s b/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakPlayerGun.s rename to asm/MetroidPrime/Tweaks/CTweakPlayerGun.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakPlayerRes.s b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakPlayerRes.s rename to asm/MetroidPrime/Tweaks/CTweakPlayerRes.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakSlideShow.s b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakSlideShow.s rename to asm/MetroidPrime/Tweaks/CTweakSlideShow.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweakTargeting.s b/asm/MetroidPrime/Tweaks/CTweakTargeting.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweakTargeting.s rename to asm/MetroidPrime/Tweaks/CTweakTargeting.s diff --git a/asm/Kyoto_CWD/Tweaks/CTweaks.s b/asm/MetroidPrime/Tweaks/CTweaks.s similarity index 100% rename from asm/Kyoto_CWD/Tweaks/CTweaks.s rename to asm/MetroidPrime/Tweaks/CTweaks.s diff --git a/asm/Kyoto_CWD/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CAuxWeapon.s rename to asm/MetroidPrime/Weapons/CAuxWeapon.s diff --git a/asm/Kyoto_CWD/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CBeamProjectile.s rename to asm/MetroidPrime/Weapons/CBeamProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CBomb.s rename to asm/MetroidPrime/Weapons/CBomb.s diff --git a/asm/Kyoto_CWD/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CElectricBeamProjectile.s rename to asm/MetroidPrime/Weapons/CElectricBeamProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CEnergyProjectile.s rename to asm/MetroidPrime/Weapons/CEnergyProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CFlameThrower.s rename to asm/MetroidPrime/Weapons/CFlameThrower.s diff --git a/asm/Kyoto_CWD/Weapons/CIceBeam.s b/asm/MetroidPrime/Weapons/CIceBeam.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CIceBeam.s rename to asm/MetroidPrime/Weapons/CIceBeam.s diff --git a/asm/Kyoto_CWD/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CIceImpact.s rename to asm/MetroidPrime/Weapons/CIceImpact.s diff --git a/asm/Kyoto_CWD/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CIceProjectile.s rename to asm/MetroidPrime/Weapons/CIceProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CNewFlameThrower.s rename to asm/MetroidPrime/Weapons/CNewFlameThrower.s diff --git a/asm/Kyoto_CWD/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPhazonBeam.s rename to asm/MetroidPrime/Weapons/CPhazonBeam.s diff --git a/asm/Kyoto_CWD/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPlasmaBeam.s rename to asm/MetroidPrime/Weapons/CPlasmaBeam.s diff --git a/asm/Kyoto_CWD/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPlasmaProjectile.s rename to asm/MetroidPrime/Weapons/CPlasmaProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CPlayerGun.s b/asm/MetroidPrime/Weapons/CPlayerGun.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPlayerGun.s rename to asm/MetroidPrime/Weapons/CPlayerGun.s diff --git a/asm/Kyoto_CWD/Weapons/CPowerBeam.s b/asm/MetroidPrime/Weapons/CPowerBeam.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPowerBeam.s rename to asm/MetroidPrime/Weapons/CPowerBeam.s diff --git a/asm/Kyoto_CWD/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CPowerBomb.s rename to asm/MetroidPrime/Weapons/CPowerBomb.s diff --git a/asm/Kyoto_CWD/Weapons/CProjectileInfo.s b/asm/MetroidPrime/Weapons/CProjectileInfo.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CProjectileInfo.s rename to asm/MetroidPrime/Weapons/CProjectileInfo.s diff --git a/asm/Kyoto_CWD/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CShockWave.s rename to asm/MetroidPrime/Weapons/CShockWave.s diff --git a/asm/Kyoto_CWD/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CTargetableProjectile.s rename to asm/MetroidPrime/Weapons/CTargetableProjectile.s diff --git a/asm/Kyoto_CWD/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CWaveBeam.s rename to asm/MetroidPrime/Weapons/CWaveBeam.s diff --git a/asm/Kyoto_CWD/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CWaveBuster.s rename to asm/MetroidPrime/Weapons/CWaveBuster.s diff --git a/asm/Kyoto_CWD/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/CWeapon.s rename to asm/MetroidPrime/Weapons/CWeapon.s diff --git a/asm/Kyoto_CWD/Weapons/GunController/CGSComboFire.s b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/GunController/CGSComboFire.s rename to asm/MetroidPrime/Weapons/GunController/CGSComboFire.s diff --git a/asm/Kyoto_CWD/Weapons/GunController/CGSFidget.s b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/GunController/CGSFidget.s rename to asm/MetroidPrime/Weapons/GunController/CGSFidget.s diff --git a/asm/Kyoto_CWD/Weapons/GunController/CGSFreeLook.s b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/GunController/CGSFreeLook.s rename to asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s diff --git a/asm/Kyoto_CWD/Weapons/GunController/CGunController.s b/asm/MetroidPrime/Weapons/GunController/CGunController.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/GunController/CGunController.s rename to asm/MetroidPrime/Weapons/GunController/CGunController.s diff --git a/asm/Kyoto_CWD/Weapons/GunController/CGunMotion.s b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/GunController/CGunMotion.s rename to asm/MetroidPrime/Weapons/GunController/CGunMotion.s diff --git a/asm/Kyoto_CWD/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s similarity index 100% rename from asm/Kyoto_CWD/Weapons/WeaponTypes.s rename to asm/MetroidPrime/Weapons/WeaponTypes.s diff --git a/asm/Kyoto_CWD/main.s b/asm/MetroidPrime/main.s similarity index 100% rename from asm/Kyoto_CWD/main.s rename to asm/MetroidPrime/main.s diff --git a/asm/Kyoto_CWD/text_80008894_80009144.s b/asm/MetroidPrime/text_80008894_80009144.s similarity index 100% rename from asm/Kyoto_CWD/text_80008894_80009144.s rename to asm/MetroidPrime/text_80008894_80009144.s diff --git a/obj_files.mk b/obj_files.mk index 362a46a6..4726f03d 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -6,366 +6,368 @@ INIT_O_FILES :=\ METROTRK_FILES :=\ $(BUILD_DIR)/src/MetroTRK/mslsupp.o -KYOTO_CWD :=\ - $(BUILD_DIR)/asm/Kyoto_CWD/main.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/text_80008894_80009144.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CCameraManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CControlMapper.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CFirstPersonCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CObjectList.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayer.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAxisAngle.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CEulerAngles.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFrontEndUI.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CInputGenerator.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMainFlow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMFGameLoader.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMFGame.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAutoSave.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CCredits.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPlayMovie.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSplashScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CInstruction.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAnimData.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Factories/CCharacterFactory.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Factories/CAssetFactory.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakPlayer.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweaks.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakGame.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGameProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerGun.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CStateManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CEntity.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArchMsgParmInt32.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArchMsgParmInt32Int32VoidPtr.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArchMsgParmNull.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArchMsgParmReal32.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Decode.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CIOWinManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CIOWin.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CActor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CWorld.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakParticle.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Clamp_int.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArchMsgParmControllerStatus.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CExplosion.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CGameCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGameArea.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/HUD/CSamusHud.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAnimationDatabaseGame.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CTransitionDatabaseGame.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakPlayerControl.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakPlayerGun.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPauseScreenBase.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPauseScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakGui.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptActor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptTrigger.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptWaypoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPatterned.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDoor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CStateMachine.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMapArea.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CBallCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptEffect.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CBomb.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakBall.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerState.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptTimer.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CCinematicCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAutoMapper.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCounter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMapWorld.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CAi.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/PatternedCastTo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/TCastTo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSound.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPlatform.o\ - $(BUILD_DIR)/src/Kyoto_CWD/UserNames.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptGenerator.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraWaypoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGameLight.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakTargeting.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakAutoMapper.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CParticleGenInfoGeneric.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CParticleGenInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CParticleDatabase.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakGunRes.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CTargetReticles.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CWeaponMgr.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPickup.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CDamageInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMemoryDrawEnum.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDock.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraHint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CCameraHint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptLoader.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSamusDoll.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Factories/CStateMachineFactory.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPlasmaBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPowerBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CWaveBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CIceBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CScriptMailbox.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptRelay.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSpawnPoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptRandomRelay.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBeetle.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/HUD/CHUDMemoParms.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptHUDMemo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMappableObject.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerCameraBob.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraFilterKeyframe.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraBlurKeyframe.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CCameraFilter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CMorphBall.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDamageableTrigger.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDebris.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraShaker.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptActorKeyframe.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CConsoleOutputWindow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptWater.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CWeapon.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CDamageVulnerability.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CActorLights.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPatternedInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSimpleShadow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CLightParameters.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CActorParameters.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CInGameGuiManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CWarWasp.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CWorldShadow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAudioStateWin.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerVisor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CModelData.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CDecalManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallWaypoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBloodFlower.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/TGameTypes.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPhysicsActor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPhysicsState.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CRipple.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidUVMotion.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CRippleManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CGrappleArm.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CSpacePirate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCoverPoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CPathCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidPlane.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidPlaneManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptGrapplePoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CHUDBillboardEffect.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFlickerBat.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBodyStateCmdMgr.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBodyStateInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSAttack.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSDie.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSFall.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSGetup.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSKnockBack.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSLieOnGround.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSLocomotion.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSStep.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSTurn.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBodyController.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSLoopAttack.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CTargetableProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSLoopReaction.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSteeringBehaviors.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSGroundHit.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CChozoGhost.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFireFlea.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSSlide.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSHurled.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSJump.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSGenerate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPuddleSpore.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSTaunt.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSortedLists.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDebugCameraWaypoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSpiderBallAttractionSurface.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSScripted.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPuddleToadGamma.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDistanceFog.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSProjectileAttack.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPowerBomb.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetaree.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptDockAreaChange.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSpecialFunction.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptActorRotate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CFidget.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CSpankWeed.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CParasite.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CSamusFaceReflection.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerHint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CRipper.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CCameraShakeData.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPickupGenerator.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPointOfInterest.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CDrone.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMapWorldInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Factories/CScannableObjectInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroid.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CScanDisplay.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSteam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptRipple.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CBoneTracking.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CFaceplateDecoration.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSCover.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptBallTrigger.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPlasmaProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerOrbit.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGameCollision.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CBallFilter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CAABoxFilter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGroundMovement.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CNewIntroBoss.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPhazonBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptTargetingPoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSWallHang.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptEMPulse.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/HUD/CHudDecoInterface.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CFlameThrower.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CBeamProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidPlaneCPU.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidPlaneDoor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptRoomAcoustics.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CIceSheegoth.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CCollisionActorManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CCollisionActor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerActor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakPlayerRes.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBurstFire.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFlaahgra.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerEnergyDrain.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFlameWarp.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CIceImpact.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/GameObjectLists.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CAuxWeapon.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CPlayerGun.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptAreaAttributes.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CWaveBuster.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CStaticInterference.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroidBeta.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/PathFinding/CPathFindSearch.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/PathFinding/CPathFindRegion.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/PathFinding/CPathFindArea.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/GunController/CGunController.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/GunController/CGSFreeLook.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/GunController/CGSComboFire.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/HUD/CHudBallInterface.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakGuiColors.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CFishCloud.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CHealthInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CGameState.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptVisorFlare.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptWorldTeleporter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptVisorGoo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CJellyZap.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptControllerAction.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/GunController/CGunMotion.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSwitch.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CABSIdle.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CABSFlinch.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CABSAim.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptPlayerStateChange.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CThardus.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CActorParticles.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CWallCrawlerSwarm.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptAiJumpPoint.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMessageScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFlaahgraTentacle.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/GunController/CGSFidget.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CABSReaction.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CIceProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFlyingPirate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptColorModulate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMapUniverse.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CThardusRockProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CInventoryScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CVisorFlare.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CFlaahgraPlants.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CWorldTransManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptMidi.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptStreamedAudio.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CRagDoll.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CGameOptions.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CRepulsor.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CEnvFxManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CEnergyProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptGunTurret.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CProjectileInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CInGameTweakManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBabygoth.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CEyeBall.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CIkChain.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraPitchVolume.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/RumbleFxTable.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CElitePirate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CRumbleManager.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBouncyGrenade.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CGrenadeLauncher.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CShockWave.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CRipperControlledPlatform.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CKnockBackController.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CWorldLayerState.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMagdolite.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CTeamAiMgr.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CSnakeWeedSwarm.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CBallCameraFailsafeState.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CActorContraption.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptSpindleCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptMemoryRelay.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPauseScreenFrame.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CQuitGameScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CAtomicAlpha.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CLogBookScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGBASupport.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CSaveWorld.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptCameraHintTrigger.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CAmbientAI.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CMemoryCardDriver.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSaveGameScreen.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CAtomicBeta.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CElectricBeamProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CRidley.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPuffer.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CFire.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPauseScreenBlur.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CTryclops.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/CNewFlameThrower.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Cameras/CInterpolationCamera.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CSeedling.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CGameHintInfo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CWallWalker.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CErrorOutputWindow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CRainSplashGenerator.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Factories/CSaveWorldFactory.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CFluidPlaneRender.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CBurrower.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroidPrimeExo.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptBeam.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroidPrimeEssence.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroidPrimeRelay.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerDynamics.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptMazeNode.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Weapons/WeaponTypes.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/COmegaPirate.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPhazonPool.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CNESEmulator.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CPhazonHealingNodule.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CMorphBallShadow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Player/CPlayerInputFilter.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CSlideShow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Tweaks/CTweakSlideShow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CArtifactDoll.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CProjectedShadow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CPreFrontEnd.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CGameCubeDoll.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptProjectedShadow.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CEnergyBall.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/CMetroidPrimeProjectile.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/Enemies/SPositionHistory.o\ +METROIDPRIME :=\ + $(BUILD_DIR)/asm/MetroidPrime/main.o\ + $(BUILD_DIR)/asm/MetroidPrime/text_80008894_80009144.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/CControlMapper.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CFirstPersonCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/CObjectList.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayer.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAxisAngle.o\ + $(BUILD_DIR)/asm/MetroidPrime/CEulerAngles.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFrontEndUI.o\ + $(BUILD_DIR)/asm/MetroidPrime/CInputGenerator.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMainFlow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMFGameLoader.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMFGame.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAutoSave.o\ + $(BUILD_DIR)/asm/MetroidPrime/CCredits.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPlayMovie.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSplashScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/CInstruction.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAnimData.o\ + $(BUILD_DIR)/asm/MetroidPrime/Factories/CCharacterFactory.o\ + $(BUILD_DIR)/asm/MetroidPrime/Factories/CAssetFactory.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayer.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweaks.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGame.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGameProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerGun.o\ + $(BUILD_DIR)/asm/MetroidPrime/CStateManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/CEntity.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmInt32.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmNull.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmReal32.o\ + $(BUILD_DIR)/asm/MetroidPrime/Decode.o\ + $(BUILD_DIR)/asm/MetroidPrime/CIOWinManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/CIOWin.o\ + $(BUILD_DIR)/asm/MetroidPrime/CActor.o\ + $(BUILD_DIR)/asm/MetroidPrime/CWorld.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakParticle.o\ + $(BUILD_DIR)/asm/MetroidPrime/Clamp_int.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmControllerStatus.o\ + $(BUILD_DIR)/asm/MetroidPrime/CExplosion.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CGameCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGameArea.o\ + $(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAnimationDatabaseGame.o\ + $(BUILD_DIR)/asm/MetroidPrime/CTransitionDatabaseGame.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerControl.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerGun.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPauseScreenBase.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPauseScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGui.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptActor.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptTrigger.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPatterned.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDoor.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CStateMachine.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMapArea.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CBallCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptEffect.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CBomb.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakBall.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerState.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptTimer.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCinematicCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAutoMapper.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCounter.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMapWorld.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CAi.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/PatternedCastTo.o\ + $(BUILD_DIR)/asm/MetroidPrime/TCastTo.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSound.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPlatform.o\ + $(BUILD_DIR)/src/MetroidPrime/UserNames.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptGenerator.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGameLight.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakTargeting.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakAutoMapper.o\ + $(BUILD_DIR)/asm/MetroidPrime/CParticleGenInfoGeneric.o\ + $(BUILD_DIR)/asm/MetroidPrime/CParticleGenInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/CParticleDatabase.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGunRes.o\ + $(BUILD_DIR)/asm/MetroidPrime/CTargetReticles.o\ + $(BUILD_DIR)/asm/MetroidPrime/CWeaponMgr.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPickup.o\ + $(BUILD_DIR)/asm/MetroidPrime/CDamageInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMemoryDrawEnum.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDock.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraHint.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptLoader.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSamusDoll.o\ + $(BUILD_DIR)/asm/MetroidPrime/Factories/CStateMachineFactory.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPlasmaBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPowerBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CWaveBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CIceBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/CScriptMailbox.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRelay.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBeetle.o\ + $(BUILD_DIR)/asm/MetroidPrime/HUD/CHUDMemoParms.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMappableObject.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerCameraBob.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraFilter.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CMorphBall.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDebris.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.o\ + $(BUILD_DIR)/asm/MetroidPrime/CConsoleOutputWindow.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptWater.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CWeapon.o\ + $(BUILD_DIR)/asm/MetroidPrime/CDamageVulnerability.o\ + $(BUILD_DIR)/asm/MetroidPrime/CActorLights.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPatternedInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSimpleShadow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CLightParameters.o\ + $(BUILD_DIR)/asm/MetroidPrime/CActorParameters.o\ + $(BUILD_DIR)/asm/MetroidPrime/CInGameGuiManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CWarWasp.o\ + $(BUILD_DIR)/asm/MetroidPrime/CWorldShadow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAudioStateWin.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerVisor.o\ + $(BUILD_DIR)/asm/MetroidPrime/CModelData.o\ + $(BUILD_DIR)/asm/MetroidPrime/CDecalManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBloodFlower.o\ + $(BUILD_DIR)/asm/MetroidPrime/TGameTypes.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPhysicsActor.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPhysicsState.o\ + $(BUILD_DIR)/asm/MetroidPrime/CRipple.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidUVMotion.o\ + $(BUILD_DIR)/asm/MetroidPrime/CRippleManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CGrappleArm.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CSpacePirate.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CPathCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidPlane.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidPlaneManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFlickerBat.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBodyStateInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSAttack.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSDie.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSFall.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSGetup.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSKnockBack.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSLieOnGround.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSLocomotion.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSStep.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSTurn.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBodyController.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSLoopAttack.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CTargetableProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSLoopReaction.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSteeringBehaviors.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSGroundHit.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CChozoGhost.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFireFlea.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSSlide.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSHurled.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSJump.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSGenerate.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuddleSpore.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSTaunt.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSortedLists.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSScripted.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuddleToadGamma.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSProjectileAttack.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPowerBomb.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetaree.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CFidget.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CSpankWeed.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CParasite.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CSamusFaceReflection.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CRipper.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraShakeData.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CDrone.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMapWorldInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/Factories/CScannableObjectInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroid.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CScanDisplay.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSteam.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRipple.o\ + $(BUILD_DIR)/asm/MetroidPrime/CBoneTracking.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CFaceplateDecoration.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSCover.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPlasmaProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerOrbit.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGameCollision.o\ + $(BUILD_DIR)/asm/MetroidPrime/CBallFilter.o\ + $(BUILD_DIR)/asm/MetroidPrime/CAABoxFilter.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGroundMovement.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CNewIntroBoss.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPhazonBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSWallHang.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.o\ + $(BUILD_DIR)/asm/MetroidPrime/HUD/CHudDecoInterface.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CFlameThrower.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CBeamProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidPlaneCPU.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidPlaneDoor.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CIceSheegoth.o\ + $(BUILD_DIR)/asm/MetroidPrime/CCollisionActorManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/CCollisionActor.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerRes.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBurstFire.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFlaahgra.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerEnergyDrain.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFlameWarp.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CIceImpact.o\ + $(BUILD_DIR)/asm/MetroidPrime/GameObjectLists.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CAuxWeapon.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CPlayerGun.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CWaveBuster.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CStaticInterference.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidBeta.o\ + $(BUILD_DIR)/asm/MetroidPrime/PathFinding/CPathFindSearch.o\ + $(BUILD_DIR)/asm/MetroidPrime/PathFinding/CPathFindRegion.o\ + $(BUILD_DIR)/asm/MetroidPrime/PathFinding/CPathFindArea.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/GunController/CGunController.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/GunController/CGSComboFire.o\ + $(BUILD_DIR)/asm/MetroidPrime/HUD/CHudBallInterface.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGuiColors.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CFishCloud.o\ + $(BUILD_DIR)/asm/MetroidPrime/CHealthInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CGameState.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CJellyZap.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/GunController/CGunMotion.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSwitch.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CABSIdle.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CABSFlinch.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CABSAim.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CThardus.o\ + $(BUILD_DIR)/asm/MetroidPrime/CActorParticles.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMessageScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFlaahgraTentacle.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/GunController/CGSFidget.o\ + $(BUILD_DIR)/asm/MetroidPrime/BodyState/CABSReaction.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CIceProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFlyingPirate.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMapUniverse.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CThardusRockProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/CInventoryScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/CVisorFlare.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CFlaahgraPlants.o\ + $(BUILD_DIR)/asm/MetroidPrime/CWorldTransManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptMidi.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.o\ + $(BUILD_DIR)/asm/MetroidPrime/CRagDoll.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CGameOptions.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CRepulsor.o\ + $(BUILD_DIR)/asm/MetroidPrime/CEnvFxManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CEnergyProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CProjectileInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/CInGameTweakManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBabygoth.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CEyeBall.o\ + $(BUILD_DIR)/asm/MetroidPrime/CIkChain.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.o\ + $(BUILD_DIR)/asm/MetroidPrime/RumbleFxTable.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CElitePirate.o\ + $(BUILD_DIR)/asm/MetroidPrime/CRumbleManager.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBouncyGrenade.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CGrenadeLauncher.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CShockWave.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CRipperControlledPlatform.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CKnockBackController.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CWorldLayerState.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMagdolite.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CTeamAiMgr.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CActorContraption.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPauseScreenFrame.o\ + $(BUILD_DIR)/asm/MetroidPrime/CQuitGameScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CAtomicAlpha.o\ + $(BUILD_DIR)/asm/MetroidPrime/CLogBookScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGBASupport.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CSaveWorld.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CAmbientAI.o\ + $(BUILD_DIR)/asm/MetroidPrime/CMemoryCardDriver.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSaveGameScreen.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CAtomicBeta.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CElectricBeamProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CRidley.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuffer.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CFire.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPauseScreenBlur.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CTryclops.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/CNewFlameThrower.o\ + $(BUILD_DIR)/asm/MetroidPrime/Cameras/CInterpolationCamera.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CSeedling.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CGameHintInfo.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CWallWalker.o\ + $(BUILD_DIR)/asm/MetroidPrime/CErrorOutputWindow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CRainSplashGenerator.o\ + $(BUILD_DIR)/asm/MetroidPrime/Factories/CSaveWorldFactory.o\ + $(BUILD_DIR)/asm/MetroidPrime/CFluidPlaneRender.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CBurrower.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeExo.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptBeam.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerDynamics.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.o\ + $(BUILD_DIR)/asm/MetroidPrime/Weapons/WeaponTypes.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/COmegaPirate.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPhazonPool.o\ + $(BUILD_DIR)/asm/MetroidPrime/CNESEmulator.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPhazonHealingNodule.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CMorphBallShadow.o\ + $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerInputFilter.o\ + $(BUILD_DIR)/asm/MetroidPrime/CSlideShow.o\ + $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakSlideShow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CArtifactDoll.o\ + $(BUILD_DIR)/asm/MetroidPrime/CProjectedShadow.o\ + $(BUILD_DIR)/asm/MetroidPrime/CPreFrontEnd.o\ + $(BUILD_DIR)/asm/MetroidPrime/CGameCubeDoll.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.o\ + $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CEnergyBall.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.o\ + $(BUILD_DIR)/asm/MetroidPrime/Enemies/SPositionHistory.o\ + +WORLDFORMAT :=\ $(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\ $(BUILD_DIR)/asm/WorldFormat/CCollisionSurface.o\ $(BUILD_DIR)/asm/WorldFormat/CMetroidModelInstance.o\ @@ -378,6 +380,8 @@ KYOTO_CWD :=\ $(BUILD_DIR)/asm/WorldFormat/CCollidableOBBTreeGroup.o\ $(BUILD_DIR)/asm/WorldFormat/CPVSVisOctree.o\ $(BUILD_DIR)/asm/WorldFormat/CAreaRenderOctTree.o\ + +WEAPONS :=\ $(BUILD_DIR)/asm/Weapons/CProjectileWeapon.o\ $(BUILD_DIR)/asm/Weapons/CProjectileWeaponDataFactory.o\ $(BUILD_DIR)/asm/Weapons/CCollisionResponseData.o\ @@ -385,7 +389,11 @@ KYOTO_CWD :=\ $(BUILD_DIR)/asm/Weapons/CDecalDataFactory.o\ $(BUILD_DIR)/asm/Weapons/CDecal.o\ $(BUILD_DIR)/asm/Weapons/CWeaponDescription.o\ + +METARENDER :=\ $(BUILD_DIR)/asm/MetaRender/CCubeRenderer.o\ + +GUISYS :=\ $(BUILD_DIR)/asm/GuiSys/CAuiMain.o\ $(BUILD_DIR)/asm/GuiSys/CAuiMeter.o\ $(BUILD_DIR)/asm/GuiSys/CGuiGroup.o\ @@ -405,6 +413,8 @@ KYOTO_CWD :=\ $(BUILD_DIR)/asm/GuiSys/CAuiEnergyBarT01.o\ $(BUILD_DIR)/asm/GuiSys/CAuiImagePane.o\ $(BUILD_DIR)/asm/GuiSys/CRepeatState.o\ + +COLLISION :=\ $(BUILD_DIR)/asm/Collision/CCollidableAABox.o\ $(BUILD_DIR)/asm/Collision/CCollidableCollisionSurface.o\ $(BUILD_DIR)/asm/Collision/CCollisionInfo.o\ @@ -416,6 +426,8 @@ KYOTO_CWD :=\ $(BUILD_DIR)/asm/Collision/CMaterialFilter.o\ $(BUILD_DIR)/asm/Collision/COBBox.o\ $(BUILD_DIR)/asm/Collision/CMRay.o\ + +KYOTO :=\ $(BUILD_DIR)/asm/Kyoto/Basics/CBasics.o\ $(BUILD_DIR)/asm/Kyoto/Basics/CStopwatch.o\ $(BUILD_DIR)/asm/Kyoto/Basics/CBasicsDolphin.o\ diff --git a/src/Kyoto_CWD/CSWDataDolphin.cpp b/src/MetroidPrime/CSWDataDolphin.cpp similarity index 100% rename from src/Kyoto_CWD/CSWDataDolphin.cpp rename to src/MetroidPrime/CSWDataDolphin.cpp diff --git a/src/Kyoto_CWD/CStringTable.cpp b/src/MetroidPrime/CStringTable.cpp similarity index 100% rename from src/Kyoto_CWD/CStringTable.cpp rename to src/MetroidPrime/CStringTable.cpp diff --git a/src/Kyoto_CWD/UserNames.cpp b/src/MetroidPrime/UserNames.cpp similarity index 100% rename from src/Kyoto_CWD/UserNames.cpp rename to src/MetroidPrime/UserNames.cpp diff --git a/src/Kyoto_CWD/main.cpp b/src/MetroidPrime/main.cpp similarity index 100% rename from src/Kyoto_CWD/main.cpp rename to src/MetroidPrime/main.cpp